From c2be760298ef1a01e4103927de0bd622b397ff9e Mon Sep 17 00:00:00 2001 From: Mohammad Rafiq Date: Thu, 27 Mar 2025 00:21:55 +0800 Subject: [PATCH] refactor: move hyprlock into centralised config --- systems/modules/programs/hyprlock.nix | 61 ++++++++++++++++++++++++--- users/modules/de.nix | 1 - users/modules/programs/hyprlock.nix | 54 ------------------------ 3 files changed, 56 insertions(+), 60 deletions(-) delete mode 100644 users/modules/programs/hyprlock.nix diff --git a/systems/modules/programs/hyprlock.nix b/systems/modules/programs/hyprlock.nix index 8c99a53..71e06ca 100644 --- a/systems/modules/programs/hyprlock.nix +++ b/systems/modules/programs/hyprlock.nix @@ -1,11 +1,62 @@ { inputs, + hostname, pkgs, ... -}: { - programs.hyprlock = { - enable = true; - package = inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock; +}: +let + cfg = + if hostname == "nemesis" then + { + mainMonitor = "HDMI-A-1"; + } + else + { + mainMonitor = ""; + }; +in +{ + security.pam.services.hyprlock = { }; + home-manager.users.rafiq = { + programs.hyprlock = { + enable = true; + package = inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock; + + settings = { + general = { + hide_cursor = true; + ignore_empty_input = true; + }; + + background = { + blur_passes = 5; + blur_size = 5; + }; + + label = { + monitor = cfg.mainMonitor; + text = ''hi, $USER.''; + font_size = 32; + halign = "center"; + valign = "center"; + position = "0, 0"; + zindex = 1; + shadow_passes = 5; + shadow_size = 5; + }; + + input-field = { + fade_on_empty = true; + size = "200, 45"; + halign = "center"; + valign = "center"; + position = "0, -5%"; + placeholder_text = ""; + zindex = 1; + shadow_passes = 5; + shadow_size = 5; + }; + }; + }; }; - security.pam.services.hyprlock = {}; } diff --git a/users/modules/de.nix b/users/modules/de.nix index cebc300..dbd30a3 100644 --- a/users/modules/de.nix +++ b/users/modules/de.nix @@ -6,7 +6,6 @@ ./programs/hyprland.nix ./programs/kitty.nix ./programs/spicetify.nix - ./programs/hyprlock.nix ./programs/fuzzel.nix ./programs/hyprshade.nix ./programs/ags.nix diff --git a/users/modules/programs/hyprlock.nix b/users/modules/programs/hyprlock.nix deleted file mode 100644 index 6ba8cd2..0000000 --- a/users/modules/programs/hyprlock.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, osConfig, ... }: -let - cfg = - if osConfig.networking.hostName == "nemesis" then - { - mainMonitor = "HDMI-A-1"; - } - else - { - mainMonitor = ""; - }; -in -{ - programs.hyprlock = { - enable = true; - package = null; - - settings = { - general = { - hide_cursor = true; - ignore_empty_input = true; - }; - - background = { - blur_passes = 5; - blur_size = 5; - }; - - label = { - monitor = cfg.mainMonitor; - text = ''hi, $USER.''; - font_size = 32; - halign = "center"; - valign = "center"; - position = "0, 0"; - zindex = 1; - shadow_passes = 5; - shadow_size = 5; - }; - - input-field = { - fade_on_empty = true; - size = "200, 45"; - halign = "center"; - valign = "center"; - position = "0, -5%"; - placeholder_text = ""; - zindex = 1; - shadow_passes = 5; - shadow_size = 5; - }; - }; - }; -}