From 973c3d8bacb5daeb39f8fb31d891542ab850b100 Mon Sep 17 00:00:00 2001 From: "Reid \"reidlab" Date: Thu, 25 Apr 2024 00:52:19 -0700 Subject: [PATCH] update hypr stuff --- flake.lock | 74 +++++++++++++++++++++-------------- modules/desktop/hypridle.nix | 8 +--- modules/desktop/hyprpaper.nix | 2 +- 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 377c687..849cca3 100644 --- a/flake.lock +++ b/flake.lock @@ -99,14 +99,14 @@ "inputs": { "hyprlang": "hyprlang", "nixpkgs": "nixpkgs_2", - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1710180874, - "narHash": "sha256-ZSn3wXQuRz36Ta/L+UCFKuUVG6QpwK2QmRkPjpQprU4=", + "lastModified": 1713472482, + "narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=", "owner": "hyprwm", "repo": "hypridle", - "rev": "4395339a2dc410bcf49f3e24f9ed3024fdb25b0a", + "rev": "7cff4581a3753154fc5b41f39a098fad49b777b1", "type": "github" }, "original": { @@ -121,7 +121,7 @@ "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_3", "nixpkgs": "nixpkgs_3", - "systems": "systems_3", + "systems": "systems_4", "wlroots": "wlroots", "xdph": "xdph" }, @@ -185,14 +185,15 @@ "nixpkgs": [ "hypridle", "nixpkgs" - ] + ], + "systems": "systems" }, "locked": { - "lastModified": 1708212860, - "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -208,7 +209,7 @@ "hyprcursor", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1709914708, @@ -255,14 +256,14 @@ "hyprlock", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -274,7 +275,7 @@ "hyprlang_5": { "inputs": { "nixpkgs": "nixpkgs_5", - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1711250455, @@ -294,14 +295,14 @@ "inputs": { "hyprlang": "hyprlang_4", "nixpkgs": "nixpkgs_4", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { - "lastModified": 1711622429, - "narHash": "sha256-JwHbbmAzX1Kfq1XAs06lKbk2TZL7mH/yLczG4BaiuTs=", + "lastModified": 1713978374, + "narHash": "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "7f8c9b6addce5174af78acaf1eb1d726fc4133b5", + "rev": "415262065fff0a04b229cd00165f346a86a0a73a", "type": "github" }, "original": { @@ -314,14 +315,14 @@ "inputs": { "hyprlang": "hyprlang_5", "nixpkgs": "nixpkgs_6", - "systems": "systems_7" + "systems": "systems_8" }, "locked": { - "lastModified": 1711556036, - "narHash": "sha256-z+ZgMjGC8540k3Z6Z49ZnEvbWyLGXtWPSCagMOrmuXk=", + "lastModified": 1712919696, + "narHash": "sha256-93zNQy4LGFP5h/GrQJctd8cPE0VdCDsWigTOx2effrE=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "5838c90cd29374935930281f62bc131d8bcf2295", + "rev": "02ee7ff3bbd9cba72f26be7b09dde4a89fc31c21", "type": "github" }, "original": { @@ -382,11 +383,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -414,11 +415,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -596,6 +597,21 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "waybar-catppuccin": { "flake": false, "locked": { diff --git a/modules/desktop/hypridle.nix b/modules/desktop/hypridle.nix index 84c7d76..3c5aa21 100644 --- a/modules/desktop/hypridle.nix +++ b/modules/desktop/hypridle.nix @@ -18,11 +18,7 @@ in { enable = true; package = cfg.package; - # the `date` command doesn't work if we just call hyprlock. Huh - # workaround is telling hyprctl to dispatch to execute it - # hacky, but i couldn't care less at the moment - # TODO: change this when/if it gets patched - lockCmd = "${config.modules.desktop.hyprland.package}/bin/hyprctl dispatch exec ${lib.getExe config.modules.desktop.hyprlock.package}"; + lockCmd = "pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}"; unlockCmd = "pkill -USR1 hyprlock"; listeners = let @@ -38,7 +34,7 @@ in { onTimeout = "loginctl lock-session"; # lock computer } { - timeout = 60 * 30; # 15 min + timeout = 60 * 30; # 30 min onTimeout = "systemctl suspend"; # sleep/suspend } ]; diff --git a/modules/desktop/hyprpaper.nix b/modules/desktop/hyprpaper.nix index 4c79d38..8e00d79 100644 --- a/modules/desktop/hyprpaper.nix +++ b/modules/desktop/hyprpaper.nix @@ -9,7 +9,7 @@ in { package = mkOption { type = types.package; default = inputs.hyprpaper.packages.${system}.hyprpaper; - example = "pkgs.hyperpaper"; + example = "pkgs.hyprpaper"; }; };