From bdca6fb2fb78b95e941927bedfd4c24ed2e83583 Mon Sep 17 00:00:00 2001
From: moons <moons@moons14.com>
Date: Mon, 3 Aug 2026 15:28:52 +0900
Subject: [PATCH] lock screen

---
 AGENTS.md                                     |  1 -
 modules/applications/noctalia/home.nix        |  4 ++--
 modules/profiles/interface/labwc/meta.nix     |  1 -
 modules/profiles/interface/niri/meta.nix      |  1 -
 .../swayidle/{home.nix => home/nixos.nix}     |  8 +++++--
 modules/services/swayidle/meta.nix            |  3 ---
 modules/services/swaylock/home.nix            | 23 -------------------
 modules/services/swaylock/nixos.nix           | 10 --------
 8 files changed, 8 insertions(+), 43 deletions(-)
 rename modules/services/swayidle/{home.nix => home/nixos.nix} (94%)
 delete mode 100644 modules/services/swayidle/meta.nix
 delete mode 100644 modules/services/swaylock/home.nix
 delete mode 100644 modules/services/swaylock/nixos.nix

diff --git a/AGENTS.md b/AGENTS.md
index 9ce1979..d0980ae 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -313,7 +313,6 @@ use fully qualified unit IDs:
     "applications.noctalia"
     "services.ly"
     "services.swayidle"
-    "services.swaylock"
   ];
 }
 ```
diff --git a/modules/applications/noctalia/home.nix b/modules/applications/noctalia/home.nix
index 8cf6154..dfb3b3a 100644
--- a/modules/applications/noctalia/home.nix
+++ b/modules/applications/noctalia/home.nix
@@ -166,8 +166,8 @@ in
 
       desktop_widgets.enabled = false;
       lockscreen = {
-        enabled = false;
-        fingerprint = false;
+        enabled = true;
+        fingerprint = true;
       };
 
       osd.kinds = {
diff --git a/modules/profiles/interface/labwc/meta.nix b/modules/profiles/interface/labwc/meta.nix
index 11039c0..65f921b 100644
--- a/modules/profiles/interface/labwc/meta.nix
+++ b/modules/profiles/interface/labwc/meta.nix
@@ -7,6 +7,5 @@
     "applications.noctalia"
     "services.ly"
     "services.swayidle"
-    "services.swaylock"
   ];
 }
diff --git a/modules/profiles/interface/niri/meta.nix b/modules/profiles/interface/niri/meta.nix
index 95d7501..cf9545e 100644
--- a/modules/profiles/interface/niri/meta.nix
+++ b/modules/profiles/interface/niri/meta.nix
@@ -7,6 +7,5 @@
     "applications.noctalia"
     "services.ly"
     "services.swayidle"
-    "services.swaylock"
   ];
 }
diff --git a/modules/services/swayidle/home.nix b/modules/services/swayidle/home/nixos.nix
similarity index 94%
rename from modules/services/swayidle/home.nix
rename to modules/services/swayidle/home/nixos.nix
index 1fdf333..48668f9 100644
--- a/modules/services/swayidle/home.nix
+++ b/modules/services/swayidle/home/nixos.nix
@@ -53,7 +53,7 @@ let
     ${wlopm} --on '*'
   '';
 in
-lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
+{
   services.swayidle = {
     enable = true;
     systemdTargets = [ "graphical-session.target" ];
@@ -75,7 +75,11 @@ lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
         resumeCommand = "${turnOnDisplays}";
       }
     ];
-    events.after-resume = "${afterResume}";
+    events = {
+      after-resume = "${afterResume}";
+      lock = "loginctl lock-session";
+      before-sleep = "loginctl lock-session";
+    };
   };
 
   systemd.user.services.swayidle.Service.PassEnvironment = [
diff --git a/modules/services/swayidle/meta.nix b/modules/services/swayidle/meta.nix
deleted file mode 100644
index 7a12ea9..0000000
--- a/modules/services/swayidle/meta.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  description = "swayidle idle management for Wayland sessions";
-}
diff --git a/modules/services/swaylock/home.nix b/modules/services/swaylock/home.nix
deleted file mode 100644
index 4760976..0000000
--- a/modules/services/swaylock/home.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, pkgs, ... }:
-{
-  home.packages = [ pkgs.swaylock ];
-
-  systemd.user.services.swaylock = {
-    Unit = {
-      Description = "Screen locker for Wayland";
-      Documentation = [ "man:swaylock(1)" ];
-      OnSuccess = [ "unlock.target" ];
-      PartOf = [ "lock.target" ];
-      Before = [ "lock.target" ];
-    };
-
-    Service = {
-      Type = "forking";
-      ExecStart = "${lib.getExe pkgs.swaylock} -f -i %h/.wallpapers/28.jpg";
-      Restart = "on-failure";
-      RestartSec = 0;
-    };
-
-    Install.WantedBy = [ "lock.target" ];
-  };
-}
diff --git a/modules/services/swaylock/nixos.nix b/modules/services/swaylock/nixos.nix
deleted file mode 100644
index 89b942c..0000000
--- a/modules/services/swaylock/nixos.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, ... }:
-{
-  services.systemd-lock-handler.enable = true;
-
-  security.pam.services.swaylock = {
-    fprintAuth = true;
-
-    rules.auth.fprintd.order = config.security.pam.services.swaylock.rules.auth.unix.order + 50;
-  };
-}