hosts/work/home-config.nix

@@ -33,19 +33,6 @@
       zellij.enable = true;
       zsh.enable = true;
     };
-    desktop.sway = {
-      enable = true;
-      kanshi = true;
-      swaylock.useNullPackage = true;
-      waybar = {
-        laptop = true;
-        gpuThermal.enable = false;
-        cpuThermal = {
-          hwmonPathAbs = "/sys/devices/platform/coretemp.0/hwmon/";
-          inputFilename = "temp1_input";
-        };
-      };
-    };
     web.firefox = {
       enable = true;
       optionalExtensions = with pkgs.nur.repos.rycee.firefox-addons; [

modules/home-manager/desktop/sway/default.nix

@@ -13,16 +13,6 @@ in
       description = "configure laptop mode";
     };
 
-    swaylock.useNullPackage = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Use null package to not install swaylock with Nix
-        Useful when using Home-Manager on third-party distribution to avoid
-        problem with PAM
-      '';
-    };
-
     wallpapers = {
       lockscreen = mkOption {
         type = types.str;

modules/home-manager/desktop/sway/includes/sway.nix

@@ -76,7 +76,7 @@ in
           "${mod}+Alt+k" = "kill";
           "${mod}+Alt+c" = "reload";
           "${mod}+Alt+Backspace" = "exec swaynag -t warning -m 'Exit sway?' -B 'Yes' 'swaymsg exit'";
-          "${mod}+Alt+l" = if cfg.swaylock.useNullPackage then "exec swaylock" else "exec ${pkgs.swaylock}/bin/swaylock";
+          "${mod}+Alt+l" = "exec ${pkgs.swaylock}/bin/swaylock";
         # Manage windows placement
           "${mod}+b" = "splith";
           "${mod}+v" = "splitv";

modules/home-manager/desktop/sway/includes/swayidle.nix

@@ -21,11 +21,11 @@ in
       events = [
         {
           event = "before-sleep";
-          command = if cfg.swaylock.useNullPackage then "swaylock" else "${pkgs.swaylock}/bin/swaylock";
+          command = "${pkgs.swaylock}/bin/swaylock -f";
         }
         {
           event = "lock";
-          command = if cfg.swaylock.useNullPackage then "swaylock" else "${pkgs.swaylock}/bin/swaylock";
+          command = "${pkgs.swaylock}/bin/swaylock -f";
         }
       ];
     };

modules/home-manager/desktop/sway/includes/swaylock.nix

@@ -6,10 +6,9 @@ in
 {
   config = mkIf config.modules.desktop.sway.enable {
     programs.swaylock = {
-      package = if cfg.swaylock.useNullPackage then null else pkgs.swaylock;
       enable = true;
       settings = {
-        image = if cfg.wallpapers.lockscreen != "" then "${cfg.wallpapers.lockscreen}" else false;
+        image = "${cfg.wallpapers.lockscreen}";
         scaling = "center";
         color = "000000";
         indicator-radius = 70;