Replace hyprlock with swaylock and remove fingerprint reader

machines/thinkpad/default.nix

@@ -12,14 +12,7 @@
     ../../modules/desktop
   ];
 
-  services.fprintd.enable = true;
   services.gnome.gnome-keyring.enable = true;
-  security.pam.services = {
-    login.fprintAuth = true;
-    sudo.fprintAuth = true;
-    hyprlock.fprintAuth = true;
-    login.enableGnomeKeyring = true;
-  };
 
   systemd.services.disable-thinkpad-leds = {
     description = "Disable ThinkPad lid logo LED and power button led";

modules/desktop/default.nix

@@ -22,6 +22,7 @@
   imports = [
     inputs.zen-browser.homeModules.beta
     ./hypr
+    ./swaylock
   ];
 
   programs.zen-browser = {

modules/desktop/hypr/bindings/default.nix

@@ -63,7 +63,7 @@ in
 
       "$mod, D, exec, darkman toggle"
       "$mod, space, exec, ${nanostatus}/bin/nanostatus-toggle"
-      "$mod, delete, exec, hyprlock"
+      "$mod, delete, exec, swaylock"
       "$shiftMod, M, exec, ${toggle-mirror-display}/bin/toggle-mirror-display"
 
       # Text input (macOS-like way of producing Norwegian characters)

modules/desktop/hypr/default.nix

@@ -5,7 +5,7 @@ in
   imports = [
     ./bindings
     ./hypridle
-    ./hyprlock
+    # ./hyprlock
   ];
 
   programs.kitty.enable = true;
@@ -15,7 +15,7 @@ in
 
     settings = {
 
-      exec-once = [ "hyprlock || hyprctl dispatch exit" ];
+      exec-once = [ "swaylock || hyprctl dispatch exit" ];
 
       misc.disable_hyprland_logo = true;
 

modules/desktop/hypr/hypridle/default.nix

@@ -3,7 +3,7 @@
     enable = true;
     settings = {
       general = {
-        lock_cmd = "hyprlock";
+        lock_cmd = "swaylock";
         before_sleep_cmd = "loginctl lock-session";
       };
       listener = [

modules/desktop/hypr/hyprlock/default.nix

@@ -1,32 +0,0 @@
-{
-  programs.hyprlock = {
-    enable = true;
-
-    settings = {
-      background = [
-        {
-          monitor = "";
-          path = "screenshot";
-          blur_passes = 3;
-        }
-      ];
-
-      input-field = [
-        {
-          monitor = "";
-          size = "600, 100";
-          position = "0, 0";
-          halign = "center";
-          valign = "center";
-
-          outline_thickness = 4;
-
-          placeholder_text = "⋯";
-          fade_on_empty = false;
-        }
-      ];
-
-      auth."fingerprint:enabled" = true;
-    };
-  };
-}

modules/desktop/swaylock/default.nix

@@ -0,0 +1,40 @@
+let
+  theme = import ../theme;
+in
+{
+  programs.swaylock = {
+    enable = true;
+    settings = {
+      color = theme.bg.dark;
+      indicator-caps-lock = true;
+
+      inside-color = theme.bg.dark;
+      inside-clear-color = theme.bg.dark;
+      inside-caps-lock-color = theme.bg.dark;
+      inside-ver-color = theme.bg.dark;
+      inside-wrong-color = theme.bg.dark;
+
+      ring-color = theme.secondary.dark;
+      ring-clear-color = theme.warning.dark;
+      ring-caps-lock-color = theme.primary.light;
+      ring-ver-color = theme.primary.dark;
+      ring-wrong-color = theme.error.dark;
+
+      text-color = theme.fg.dark;
+      text-clear-color = theme.fg.dark;
+      text-caps-lock-color = theme.fg.dark;
+      text-ver-color = theme.fg.dark;
+      text-wrong-color = theme.fg.dark;
+
+      key-hl-color = theme.primary.light;
+      bs-hl-color = theme.warning.dark;
+
+      line-color = "00000000";
+      line-clear-color = "00000000";
+      line-caps-lock-color = "00000000";
+      line-ver-color = "00000000";
+      line-wrong-color = "00000000";
+      separator-color = "00000000";
+    };
+  };
+}

modules/desktop/theme/default.nix

@@ -1,12 +1,12 @@
 {
-  bg = {
-    light = "FAFAFA";
-    dark = "2E3440";
-  };
   fg = {
     light = "37474F";
     dark = "ECEFF4";
   };
+  bg = {
+    light = "FAFAFA";
+    dark = "2E3440";
+  };
   primary = {
     light = "673AB7";
     dark = "81A1C1";
@@ -15,4 +15,12 @@
     light = "90A4AE";
     dark = "677691";
   };
+  warning = {
+    light = "FF6F00";
+    dark = "EBCB8B";
+  };
+  error = {
+    light = "FFAB91";
+    dark = "D08770";
+  };
 }