reidlab/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update hypr stuff

Browse source
This commit is contained in:
Reid 2024-04-25 00:52:19 -07:00
parent ca5c52e679
commit 973c3d8bac
3 changed files with 48 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

74
flake.lock generated
View file

@ -99,14 +99,14 @@
"inputs": { "inputs": {
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710180874, "lastModified": 1713472482,
"narHash": "sha256-ZSn3wXQuRz36Ta/L+UCFKuUVG6QpwK2QmRkPjpQprU4=", "narHash": "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hypridle", "repo": "hypridle",
"rev": "4395339a2dc410bcf49f3e24f9ed3024fdb25b0a", "rev": "7cff4581a3753154fc5b41f39a098fad49b777b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -121,7 +121,7 @@
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang_3", "hyprlang": "hyprlang_3",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"systems": "systems_3", "systems": "systems_4",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
@ -185,14 +185,15 @@
"nixpkgs": [ "nixpkgs": [
"hypridle", "hypridle",
"nixpkgs" "nixpkgs"
] ],
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1708212860, "lastModified": 1713121246,
"narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,7 +209,7 @@
"hyprcursor", "hyprcursor",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1709914708, "lastModified": 1709914708,
@ -255,14 +256,14 @@
"hyprlock", "hyprlock",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1711250455, "lastModified": 1713121246,
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -274,7 +275,7 @@
"hyprlang_5": { "hyprlang_5": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"systems": "systems_6" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1711250455, "lastModified": 1711250455,
@ -294,14 +295,14 @@
"inputs": { "inputs": {
"hyprlang": "hyprlang_4", "hyprlang": "hyprlang_4",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1711622429, "lastModified": 1713978374,
"narHash": "sha256-JwHbbmAzX1Kfq1XAs06lKbk2TZL7mH/yLczG4BaiuTs=", "narHash": "sha256-jla5Wo0Qt3NEnD0OjNj85BGw0pR4Zlz5uy8AqHH7tuE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlock", "repo": "hyprlock",
"rev": "7f8c9b6addce5174af78acaf1eb1d726fc4133b5", "rev": "415262065fff0a04b229cd00165f346a86a0a73a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,14 +315,14 @@
"inputs": { "inputs": {
"hyprlang": "hyprlang_5", "hyprlang": "hyprlang_5",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"systems": "systems_7" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1711556036, "lastModified": 1712919696,
"narHash": "sha256-z+ZgMjGC8540k3Z6Z49ZnEvbWyLGXtWPSCagMOrmuXk=", "narHash": "sha256-93zNQy4LGFP5h/GrQJctd8cPE0VdCDsWigTOx2effrE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "5838c90cd29374935930281f62bc131d8bcf2295", "rev": "02ee7ff3bbd9cba72f26be7b09dde4a89fc31c21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,11 +383,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1708475490, "lastModified": 1712963716,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +415,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1711523803, "lastModified": 1712963716,
"narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -596,6 +597,21 @@
"type": "github" "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": { "waybar-catppuccin": {
"flake": false, "flake": false,
"locked": { "locked": {

8
modules/desktop/hypridle.nix
View file

@ -18,11 +18,7 @@ in {
enable = true; enable = true;
package = cfg.package; package = cfg.package;
# the `date` command doesn't work if we just call hyprlock. Huh lockCmd = "pidof hyprlock || ${lib.getExe config.modules.desktop.hyprlock.package}";
# 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}";
unlockCmd = "pkill -USR1 hyprlock"; unlockCmd = "pkill -USR1 hyprlock";
listeners = let listeners = let
@ -38,7 +34,7 @@ in {
onTimeout = "loginctl lock-session"; # lock computer onTimeout = "loginctl lock-session"; # lock computer
} }
{ {
timeout = 60 * 30; # 15 min timeout = 60 * 30; # 30 min
onTimeout = "systemctl suspend"; # sleep/suspend onTimeout = "systemctl suspend"; # sleep/suspend
} }
]; ];

2
modules/desktop/hyprpaper.nix
View file

@ -9,7 +9,7 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = inputs.hyprpaper.packages.${system}.hyprpaper; default = inputs.hyprpaper.packages.${system}.hyprpaper;
example = "pkgs.hyperpaper"; example = "pkgs.hyprpaper";
}; };
}; };