refactor(home): move swaylock to module

nevivurn · Jul 15, 2024 · 9c13db5 · 9c13db5
1 parent d5dbc6b
commit 9c13db5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/home/profiles/sway/default.nix b/home/profiles/sway/default.nix
@@ -464,15 +464,15 @@ in
     enable = true;
     events =
       let
-        swaylock = config.programs.swaylock.package;
+        swaylock = lib.getExe config.programs.swaylock.package;
       in
       [
         {
-          command = "${swaylock}/bin/swaylock -f";
+          command = "${swaylock} -f";
           event = "lock";
         }
         {
-          command = "${swaylock}/bin/swaylock -f";
+          command = "${swaylock} -f";
           event = "before-sleep";
         }
       ];

diff --git a/nixos/profiles/graphical/default.nix b/nixos/profiles/graphical/default.nix
@@ -13,6 +13,9 @@
   services.pipewire.enable = true;
   services.pipewire.pulse.enable = true;
 
+  # swaylock locks out otherwise
+  security.pam.services.swaylock = { };
+
   hardware.bluetooth = {
     enable = true;
     settings = {

diff --git a/systems/taiyi/default.nix b/systems/taiyi/default.nix
@@ -147,9 +147,6 @@ in
 
   ## Other hardware-specific configuration
 
-  # swaylock locks out otherwise
-  security.pam.services.swaylock = { };
-
   # podman requires system-level config
   virtualisation.podman = {
     enable = true;

diff --git a/systems/tianyi/default.nix b/systems/tianyi/default.nix
@@ -250,9 +250,6 @@ in
   services.xserver.xkb.options = "ctrl:swapcaps,korean:ralt_hangul";
   console.useXkbConfig = true;
 
-  # swaylock locks out otherwise
-  security.pam.services.swaylock = { };
-
   # podman requires system-level config
   virtualisation.podman = {
     enable = true;