From 634c79c3bdeabc69db90475c13a9d0f90c662c5b Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Thu, 22 Aug 2024 16:27:34 +0200 Subject: [PATCH] . --- Makefile | 2 +- home.nix | 25 +++++++++++++++++++++---- hyprland/hyprland.nix | 3 +-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index dead957..3879adb 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ setup-desktop: install: touch ~/.vw-session-key touch ~/.config/hypr/monitors.conf - nix-collect-garbage --delete-old + sudo nix-collect-garbage --delete-old sudo env NIXPKGS_ALLOW_BROKEN=1 nixos-rebuild switch --flake .#ziltis-desktop --impure --show-trace # end diff --git a/home.nix b/home.nix index 2246c48..238a90e 100644 --- a/home.nix +++ b/home.nix @@ -21,13 +21,14 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }: freetype gamescope gcc + ghostscript git-cola git-doc git-filter-repo grim home-manager - hyprpaper hyprcursor + hyprpaper iconv kteatime lagrange @@ -149,12 +150,14 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }: address = "dziltener@lyrion.ch"; imap = { host = "lyrion.ch"; + port = 993; tls = { enable = true; }; }; smtp = { host = "lyrion.ch"; + port = 465; tls = { enable = true; }; @@ -449,7 +452,7 @@ programs.hyprlock = { background = { path = "screenshot"; blur_passes = 2; - blur_size = 5; + blur_size = 8; noise = 0.0117; contrast = 0.8916; brightness = 0.8172; @@ -501,12 +504,11 @@ services.hypridle = { settings = { general = { after_sleep_cmd = "hyprctl dispatch dpms on"; - lock_cmd = "pgrep hyprlock || hyprlock"; }; listener = [ { timeout = 300; - on-timeout = "$lock_cmd"; + on-timeout = "pgrep hyprlock || hyprlock"; } { timeout = 1200; @@ -517,6 +519,21 @@ services.hypridle = { }; }; +services.hyprpaper ={ + enable = true; + settings = { + ipc = "on"; + splash = true; + splash_offset = 2.0; + preload = [ + "${config.home.homeDirectory}/Stow/Desktop/config/wallpapers/Next/contents/images/3840x2160.png" + ]; + wallpaper = [ + ",${config.home.homeDirectory}/Stow/Desktop/config/wallpapers/Next/contents/images/3840x2160.png" + ]; + }; +}; + # services.mako = { # enable = true; # defaultTimeout = 5000; diff --git a/hyprland/hyprland.nix b/hyprland/hyprland.nix index 086d572..2d2ef33 100644 --- a/hyprland/hyprland.nix +++ b/hyprland/hyprland.nix @@ -80,7 +80,7 @@ master = { new_status = "slave"; orientation = "center"; - workspace = "w[g2], layoutopt:orientation:left"; + #workspace = "w[g2], layoutopt:orientation:left"; always_center_master = true; mfact = 0.5; special_scale_factor = 0.8; @@ -171,7 +171,6 @@ exec-once = [ "[workspace special] ${pkgs.kitty}/bin/kitty" "sleep 1; hyprctl dispatch layoutmsg orientationleft; hyprctl dispatch togglespecialworkspace" - "hyprpaper" ]; }; };