From fa40647600cd418fca6e1cabb96fff78eef599b2 Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Wed, 2 Oct 2024 18:14:49 +0200 Subject: [PATCH] move swaylock to hosts/common --- hosts/common/optional/swaylock.nix | 60 ++++++++++++++++++++++++++ modules/gui/default.nix | 1 - modules/gui/swaylock.nix | 69 ------------------------------ 3 files changed, 60 insertions(+), 70 deletions(-) create mode 100644 hosts/common/optional/swaylock.nix delete mode 100644 modules/gui/swaylock.nix diff --git a/hosts/common/optional/swaylock.nix b/hosts/common/optional/swaylock.nix new file mode 100644 index 0000000..de66c57 --- /dev/null +++ b/hosts/common/optional/swaylock.nix @@ -0,0 +1,60 @@ +{ + config, + ... +}: let + inherit (config.poz.other.system) username; +in { + # https://github.com/NixOS/nixpkgs/issues/158025 + security.pam.services.swaylock.text = "auth include login"; + + home-manager.users.${username} = { + programs.swaylock = { + enable = true; + settings = { + daemonize = false; + show-failed-attempts = true; + clock = true; + screenshots = true; + effect-blur = "9x5"; + effect-vignette = "0.5:0.5"; + indicator = true; + indicator-radius = 200; + indicator-thickness = 20; + color = "1e1e2e"; + bs-hl-color = "f5e0dc"; + caps-lock-bs-hl-color = "f5e0dc"; + caps-lock-key-hl-color = "a6e3a1"; + inside-color = "00000000"; + inside-clear-color = "00000000"; + inside-caps-lock-color = "00000000"; + inside-ver-color = "00000000"; + inside-wrong-color = "00000000"; + key-hl-color = "a6e3a1"; + layout-bg-color = "00000000"; + layout-border-color = "00000000"; + layout-text-color = "cdd6f4"; + line-color = "00000000"; + line-clear-color = "00000000"; + line-caps-lock-color = "00000000"; + line-ver-color = "00000000"; + line-wrong-color = "00000000"; + ring-color = "b4befe"; + ring-clear-color = "f5e0dc"; + ring-caps-lock-color = "fab387"; + ring-ver-color = "89b4fa"; + ring-wrong-color = "eba0ac"; + separator-color = "00000000"; + text-color = "cdd6f4"; + text-clear-color = "f5e0dc"; + text-caps-lock-color = "fab387"; + text-ver-color = "89b4fa"; + text-wrong-color = "eba0ac"; + grace = 2; + grace-no-mouse = true; + grace-no-touch = true; + fade-in = 0.2; + ignore-empty-password = true; + }; + }; + }; +} diff --git a/modules/gui/default.nix b/modules/gui/default.nix index af6ef66..88fb12d 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -11,7 +11,6 @@ _: { ./mpv.nix ./qt.nix #./schizofox.nix - ./swaylock.nix ./zathura.nix ]; } diff --git a/modules/gui/swaylock.nix b/modules/gui/swaylock.nix deleted file mode 100644 index cecd496..0000000 --- a/modules/gui/swaylock.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.poz.programs.swaylock; - inherit (config.poz.other.system) username; - - inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; -in { - options.poz.programs.swaylock.enable = mkEnableOption "swaylock"; - - config = mkIf cfg.enable { - # https://github.com/NixOS/nixpkgs/issues/158025 - security.pam.services.swaylock.text = "auth include login"; - - home-manager.users.${username} = { - programs.swaylock = { - enable = true; - settings = { - daemonize = false; - show-failed-attempts = true; - clock = true; - screenshots = true; - effect-blur = "9x5"; - effect-vignette = "0.5:0.5"; - indicator = true; - indicator-radius = 200; - indicator-thickness = 20; - color = "1e1e2e"; - bs-hl-color = "f5e0dc"; - caps-lock-bs-hl-color = "f5e0dc"; - caps-lock-key-hl-color = "a6e3a1"; - inside-color = "00000000"; - inside-clear-color = "00000000"; - inside-caps-lock-color = "00000000"; - inside-ver-color = "00000000"; - inside-wrong-color = "00000000"; - key-hl-color = "a6e3a1"; - layout-bg-color = "00000000"; - layout-border-color = "00000000"; - layout-text-color = "cdd6f4"; - line-color = "00000000"; - line-clear-color = "00000000"; - line-caps-lock-color = "00000000"; - line-ver-color = "00000000"; - line-wrong-color = "00000000"; - ring-color = "b4befe"; - ring-clear-color = "f5e0dc"; - ring-caps-lock-color = "fab387"; - ring-ver-color = "89b4fa"; - ring-wrong-color = "eba0ac"; - separator-color = "00000000"; - text-color = "cdd6f4"; - text-clear-color = "f5e0dc"; - text-caps-lock-color = "fab387"; - text-ver-color = "89b4fa"; - text-wrong-color = "eba0ac"; - grace = 2; - grace-no-mouse = true; - grace-no-touch = true; - fade-in = 0.2; - ignore-empty-password = true; - }; - }; - }; - }; -}