From 3db03e8d0da1d27376e32183d02bdca38be2d809 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sat, 11 Nov 2023 18:32:38 +0900 Subject: 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. --- nixos/alpha/configuration.nix | 5 +++-- nixos/haruka/configuration.nix | 5 +++-- 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; -- cgit 1.4.1