diff --git a/home/modules/hypridle.nix b/home/modules/hypridle.nix index 89b89af..4857ab1 100644 --- a/home/modules/hypridle.nix +++ b/home/modules/hypridle.nix @@ -1,32 +1,31 @@ { - lib, - isNixOS, + pkgs, ... }: + { - services.hypridle = { - enable = true; - package = lib.mkIf (!isNixOS) null; - settings = { - general = { - lock_cmd = "wp lock && hyprlock"; - after_sleep_cmd = "hyprctl dispatch dpms on"; - }; - listener = [ - { - timeout = 300; - on-timeout = "wp lock && hyprlock"; - } - { - timeout = 600; - on-timeout = "hyprctl dispatch dpms off"; - on-resume = "hyprctl dispatch dpms on"; - } - { - timeout = 1800; - on-timeout = "systemctl suspend"; - } - ]; - }; - }; + home.packages = [ pkgs.hypridle ]; + + xdg.configFile."hypr/hypridle.conf".text = '' + general { + lock_cmd = wp lock && hyprlock + after_sleep_cmd = hyprctl dispatch dpms on + } + + listener { + timeout = 300 + on-timeout = wp lock && hyprlock + } + + listener { + timeout = 600 + on-timeout = hyprctl dispatch dpms off + on-resume = hyprctl dispatch dpms on + } + + listener { + timeout = 1800 + on-timeout = systemctl suspend + } + ''; } diff --git a/home/modules/hyprlock.nix b/home/modules/hyprlock.nix index d4ed4bf..4fde391 100644 --- a/home/modules/hyprlock.nix +++ b/home/modules/hyprlock.nix @@ -1,25 +1,26 @@ { - lib, + pkgs, + config, isNixOS, ... }: { - programs.hyprlock = { - enable = true; - package = lib.mkIf (!isNixOS) null; - settings = { - general = { - hide_cursor = true; - grace = 0; - }; - background = [ - { - monitor = ""; - path = "~/img/screen/lock.jpg"; - } - ]; - animations.enabled = false; - }; - }; + home.packages = [ pkgs.hyprlock ]; + + xdg.configFile."hypr/hyprlock.conf".text = '' + general { + hide_cursor = true + grace = 0 + } + + background { + monitor = + path = ${config.home.homeDirectory}/img/screen/lock.jpg + } + + animations { + enabled = false + } + ''; } diff --git a/home/modules/hyprpaper.nix b/home/modules/hyprpaper.nix index b032eb0..1cc109a 100644 --- a/home/modules/hyprpaper.nix +++ b/home/modules/hyprpaper.nix @@ -1,6 +1,7 @@ { pkgs, lib, + config, isNixOS, ... }: @@ -8,13 +9,12 @@ { home.packages = lib.mkIf isNixOS [ pkgs.hyprpaper ]; - services.hyprpaper = { - enable = true; - package = lib.mkIf (!isNixOS) null; - settings = { - preload = [ "~/img/screen/wallpaper.jpg" ]; - wallpaper = [ ",~/img/screen/wallpaper.jpg" ]; - splash = false; - }; - }; + xdg.configFile."hypr/hyprpaper.conf".text = '' + wallpaper { + monitor = + path = ${config.home.homeDirectory}/img/screen/wallpaper.jpg + } + + splash = false + ''; }