From 2b5b502192254f1d15dc11e4d6072cbad5aa840d Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 12 May 2024 23:54:01 -0400 Subject: [PATCH] wayland: update hypr* configs --- home/wayland/programs/hyprlock.nix | 195 ++++++++++++++-------------- home/wayland/services/hypridle.nix | 31 +++-- home/wayland/services/hyprpaper.nix | 29 +++-- 3 files changed, 128 insertions(+), 127 deletions(-) diff --git a/home/wayland/programs/hyprlock.nix b/home/wayland/programs/hyprlock.nix index a94c61a..40de5e1 100644 --- a/home/wayland/programs/hyprlock.nix +++ b/home/wayland/programs/hyprlock.nix @@ -1,102 +1,103 @@ -{inputs, ...}: { - imports = [inputs.hyprlock.homeManagerModules.default]; +_: { programs.hyprlock = { enable = true; - backgrounds = let - verticalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle.png"; - horizontalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle2.png"; - in [ - { - monitor = "HDMI-A-1"; - path = verticalWallpaper; - blur_passes = 3; - blur_size = 4; - brightness = 0.5; - } - { - monitor = "DP-3"; - path = verticalWallpaper; - blur_passes = 3; - blur_size = 4; - brightness = 0.5; - } - { - monitor = "DP-1"; - path = horizontalWallpaper; - blur_passes = 3; - blur_size = 4; - brightness = 0.5; - } - { - monitor = "DP-2"; - path = horizontalWallpaper; - blur_passes = 3; - blur_size = 4; - brightness = 0.5; - } - ]; - general = { - grace = 5; - disable_loading_bar = false; - hide_cursor = false; - no_fade_in = false; + settings = { + backgrounds = let + verticalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle.png"; + horizontalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle2.png"; + in [ + { + monitor = "HDMI-A-1"; + path = verticalWallpaper; + blur_passes = 3; + blur_size = 4; + brightness = 0.5; + } + { + monitor = "DP-3"; + path = verticalWallpaper; + blur_passes = 3; + blur_size = 4; + brightness = 0.5; + } + { + monitor = "DP-1"; + path = horizontalWallpaper; + blur_passes = 3; + blur_size = 4; + brightness = 0.5; + } + { + monitor = "DP-2"; + path = horizontalWallpaper; + blur_passes = 3; + blur_size = 4; + brightness = 0.5; + } + ]; + general = { + grace = 5; + disable_loading_bar = false; + hide_cursor = false; + no_fade_in = false; + }; + input-fields = [ + { + monitor = "DP-2"; + size = { + width = 350; + height = 50; + }; + outline_thickness = 2; + outer_color = "rgb(f7768e)"; + inner_color = "rgb(1a1b26)"; + font_color = "rgb(c0caf5)"; + fail_color = "rgb(f7768e)"; + fail_text = "$FAIL ($ATTEMPTS)"; + check_color = "rgb(ff9e64)"; + swap_font_color = false; + placeholder_text = '' + Password... + ''; + fade_on_empty = false; + dots_spacing = 0.5; + dots_center = true; + shadow_passes = 3; + shadow_size = 1; + shadow_color = "rgba(00000099)"; + shadow_boost = 1.0; + } + ]; + labels = [ + { + monitor = "DP-2"; + text = '' + Hi, $USER + ''; + color = "rgb(c0caf5)"; + valign = "center"; + halign = "center"; + shadow_passes = 3; + shadow_size = 1; + shadow_color = "rgba(00000099)"; + shadow_boost = 1.0; + } + { + monitor = "DP-2"; + text = "$TIME"; + color = "rgb(c0caf5)"; + position = { + x = 0; + y = 120; + }; + valign = "center"; + halign = "center"; + shadow_passes = 3; + shadow_size = 1; + shadow_color = "rgba(00000099)"; + shadow_boost = 0.6; + } + ]; }; - input-fields = [ - { - monitor = "DP-2"; - size = { - width = 350; - height = 50; - }; - outline_thickness = 2; - outer_color = "rgb(f7768e)"; - inner_color = "rgb(1a1b26)"; - font_color = "rgb(c0caf5)"; - fail_color = "rgb(f7768e)"; - fail_text = "$FAIL ($ATTEMPTS)"; - check_color = "rgb(ff9e64)"; - swap_font_color = false; - placeholder_text = '' - Password... - ''; - fade_on_empty = false; - dots_spacing = 0.5; - dots_center = true; - shadow_passes = 3; - shadow_size = 1; - shadow_color = "rgba(00000099)"; - shadow_boost = 1.0; - } - ]; - labels = [ - { - monitor = "DP-2"; - text = '' - Hi, $USER - ''; - color = "rgb(c0caf5)"; - valign = "center"; - halign = "center"; - shadow_passes = 3; - shadow_size = 1; - shadow_color = "rgba(00000099)"; - shadow_boost = 1.0; - } - { - monitor = "DP-2"; - text = "$TIME"; - color = "rgb(c0caf5)"; - position = { - x = 0; - y = 120; - }; - valign = "center"; - halign = "center"; - shadow_passes = 3; - shadow_size = 1; - shadow_color = "rgba(00000099)"; - shadow_boost = 0.6; - } - ]; }; } diff --git a/home/wayland/services/hypridle.nix b/home/wayland/services/hypridle.nix index 41c7e55..fd2d6c7 100644 --- a/home/wayland/services/hypridle.nix +++ b/home/wayland/services/hypridle.nix @@ -1,26 +1,25 @@ { - inputs, pkgs, lib, config, ... }: { - imports = [inputs.hypridle.homeManagerModules.default]; services.hypridle = { enable = true; - ignoreDbusInhibit = false; - lockCmd = lib.getExe config.programs.hyprlock.package; - beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session"; - listeners = [ - { - timeout = 400; - onTimeout = "${lib.getExe config.programs.hyprlock.package}"; - } - { - timeout = 460; - onTimeout = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off"; - onResume = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on"; - } - ]; + settings = { + ignoreDbusInhibit = false; + lockCmd = lib.getExe config.programs.hyprlock.package; + beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session"; + listeners = [ + { + timeout = 400; + onTimeout = "${lib.getExe config.programs.hyprlock.package}"; + } + { + timeout = 460; + onTimeout = "${pkgs.systemd}/bin/systemctl suspend"; + } + ]; + }; }; } diff --git a/home/wayland/services/hyprpaper.nix b/home/wayland/services/hyprpaper.nix index d0eca22..e997e39 100644 --- a/home/wayland/services/hyprpaper.nix +++ b/home/wayland/services/hyprpaper.nix @@ -1,18 +1,19 @@ -{inputs, ...}: { - imports = [inputs.hyprpaper.homeManagerModules.default]; +_: { services.hyprpaper = { enable = true; - ipc = true; - splash = false; - preloads = [ - "~/Pictures/wallpapers/sparkle3.png" - "~/Pictures/wallpapers/sparkle4.png" - ]; - wallpapers = [ - "HDMI-A-1,~/Pictures/wallpapers/sparkle3.png" - "DP-1,~/Pictures/wallpapers/sparkle4.png" - "DP-2,~/Pictures/wallpapers/sparkle4.png" - "DP-3,~/Pictures/wallpapers/sparkle3.png" - ]; + settings = { + ipc = true; + splash = false; + preloads = [ + "~/Pictures/wallpapers/sparkle3.png" + "~/Pictures/wallpapers/sparkle4.png" + ]; + wallpapers = [ + "HDMI-A-1,~/Pictures/wallpapers/sparkle3.png" + "DP-1,~/Pictures/wallpapers/sparkle4.png" + "DP-2,~/Pictures/wallpapers/sparkle4.png" + "DP-3,~/Pictures/wallpapers/sparkle3.png" + ]; + }; }; }