hyprlock: drop; switch to swaylock (#9)

* swaylock: fix catppuccin namespace * mirage: switch to swaylock * treewide: drop hyprland module; move swaylock to common
w-lfchen · Dec 31, 2024 · df92754 · df92754
1 parent 9c019af
commit df92754
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 52 deletions.
diff --git a/hosts/mirage/configuration.nix b/hosts/mirage/configuration.nix
@@ -19,7 +19,7 @@
   # host specific config
   environment.systemPackages = with pkgs; [ brightnessctl ];
 
-  security.pam.services.hyprlock = { };
+  security.pam.services.swaylock = { };
 
   # https://www.reddit.com/r/linux/comments/1em8biv/psa_pipewire_has_been_halving_your_battery_life/
   services.pipewire.wireplumber.extraConfig."wireplumber.profiles".main."monitor.libcamera" = "disabled";

diff --git a/hosts/mirage/home.nix b/hosts/mirage/home.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     modules.home.default
-    modules.home.hyprlock
     modules.home.wlogout
   ];
 

diff --git a/hosts/refuge/home.nix b/hosts/refuge/home.nix
@@ -4,7 +4,6 @@
     modules.home.default
     modules.home.nvidia
     modules.home.obs
-    modules.home.swaylock
   ];
 
   home.stateVersion = "23.05"; # don't change this value

diff --git a/modules/home/common/default.nix b/modules/home/common/default.nix
@@ -7,6 +7,7 @@
     ./programs.nix
     ./services.nix
     ./spotify.nix
+    ./swaylock.nix
     ./terminals.nix
     ./wm.nix
   ];

diff --git a/modules/home/swaylock.nix → modules/home/common/swaylock.nix b/modules/home/swaylock.nix → modules/home/common/swaylock.nix
@@ -1,8 +1,9 @@
 { paths, pkgs, ... }:
 {
+  catppuccin.swaylock.enable = true;
+
   programs.swaylock = {
     enable = true;
-    catppuccin.enable = true;
     package = pkgs.swaylock-effects;
     settings = {
       # use this instead of `builtins.toString wallpapers + "/refuge/line-crust.png"` in order to not rebuild upon whitespace change

diff --git a/modules/home/hyprlock.nix b/modules/home/hyprlock.nix