about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2023-11-11 18:32:38 +0900
committersefidel <contact@sefidel.net>2023-11-11 18:32:38 +0900
commit3db03e8d0da1d27376e32183d02bdca38be2d809 (patch)
tree427c8b3ce30d8280fc9238e8533c8d1a7310e3cb
parent96624d93ab65514dd392b8f14cf6ea1ba97c6442 (diff)
downloadnixrc-3db03e8d0da1d27376e32183d02bdca38be2d809.tar.gz
nixrc-3db03e8d0da1d27376e32183d02bdca38be2d809.zip
fix(nixos/{alpha, haruka}): fix swaylock failing instantly
Disabling system-wide sway has also disabled pam configurations, so
enable the module with the package set to null.

This change supersedes commit 96624d93ab65514dd392b8f14cf6ea1ba97c6442.
-rw-r--r--nixos/alpha/configuration.nix5
-rw-r--r--nixos/haruka/configuration.nix5
2 files changed, 6 insertions, 4 deletions
diff --git a/nixos/alpha/configuration.nix b/nixos/alpha/configuration.nix
index 7ecced7..64270c8 100644
--- a/nixos/alpha/configuration.nix
+++ b/nixos/alpha/configuration.nix
@@ -262,8 +262,9 @@
   };
 
   programs = {
-    # sway.enable = true;
-    # sway.extraPackages = lib.mkForce [ ];
+    sway.enable = true;
+    sway.package = null; # Managed by home-manager
+    sway.extraPackages = lib.mkForce [ ];
 
     zsh.enable = true;
     zsh.enableCompletion = false;
diff --git a/nixos/haruka/configuration.nix b/nixos/haruka/configuration.nix
index bcb5e22..33815e6 100644
--- a/nixos/haruka/configuration.nix
+++ b/nixos/haruka/configuration.nix
@@ -278,8 +278,9 @@
   };
 
   programs = {
-    # sway.enable = true;
-    # sway.extraPackages = lib.mkForce [ ];
+    sway.enable = true;
+    sway.package = null; # Managed by home-manager
+    sway.extraPackages = lib.mkForce [ ];
 
     zsh.enable = true;
     zsh.enableCompletion = true;