diff --git a/modules/home/de/hyprland/keybinds.nix b/modules/home/de/hyprland/keybinds.nix index b276cc1..80b02eb 100644 --- a/modules/home/de/hyprland/keybinds.nix +++ b/modules/home/de/hyprland/keybinds.nix @@ -8,7 +8,6 @@ # l = locked # Variables - $suspend = systemctl suspend${lib.optionalString config.myConfig.hibernation.enable "-then-hibernate"} $play-pause = playerctl --ignore-player=firefox play-pause $play-next = playerctl --ignore-player=firefox next $play-previous = playerctl --ignore-player=firefox previous @@ -62,9 +61,9 @@ bindrl = SUPER CONTROL, Q, exit, bindrl = SUPER CONTROL, P, exec, poweroff bindrl = SUPER CONTROL, R, exec, reboot - ${lib.optionalString config.myConfig.hibernation.enable "bindrl = SUPER CONTROL, H, exec, systemctl hibernate"} - bindrl = SUPER CONTROL, S, exec, $suspend - bindl = , switch:on:Lid Switch, exec, $suspend + bindrl = SUPER CONTROL, H, exec, systemctl hibernate + bindrl = SUPER CONTROL, S, exec, systemctl sleep + bindl = , switch:on:Lid Switch, exec, systemctl sleep bindrl = SUPER CONTROL, L, exec, loginctl lock-session bindrl = SUPER CONTROL, B, exec, sleep 1 && hyprctl dispatch dpms off diff --git a/modules/home/deUtils/hypridle.nix b/modules/home/deUtils/hypridle.nix index d8b3878..0cd35cd 100644 --- a/modules/home/deUtils/hypridle.nix +++ b/modules/home/deUtils/hypridle.nix @@ -37,7 +37,7 @@ } { timeout = 1800; - on-timeout = "systemctl suspend${lib.optionalString config.myConfig.hibernation.enable "-then-hibernate"}"; + on-timeout = "systemctl sleep"; } ]; }; diff --git a/modules/home/hibernate.nix b/modules/home/hibernate.nix deleted file mode 100644 index 1a0a720..0000000 --- a/modules/home/hibernate.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: -{ - options.myConfig.hibernation.enable = lib.mkEnableOption ""; -} diff --git a/users/seb/@fern/home.nix b/users/seb/@fern/home.nix index b0e78d4..acac0b1 100644 --- a/users/seb/@fern/home.nix +++ b/users/seb/@fern/home.nix @@ -3,10 +3,7 @@ home.stateVersion = "24.11"; - myConfig = { - theme = "light"; - hibernation.enable = true; - }; + myConfig.theme = "light"; wayland.windowManager.hyprland.settings.monitor = [ "eDP-1,2880x1920@120,0x0,2,vrr,1" diff --git a/users/seb/@north/home.nix b/users/seb/@north/home.nix index d2a677e..133d974 100644 --- a/users/seb/@north/home.nix +++ b/users/seb/@north/home.nix @@ -4,10 +4,7 @@ home.stateVersion = "23.11"; - myConfig = { - theme = "dark"; - hibernation.enable = true; - }; + myConfig.theme = "dark"; home.packages = [ pkgs.ffmpeg