diff --git a/modules/core/fingerprint.nix b/modules/core/fingerprint.nix
index d76a32f..10f0ea6 100644
--- a/modules/core/fingerprint.nix
+++ b/modules/core/fingerprint.nix
@@ -17,8 +17,5 @@
 
     # greetd (tuigreet / ReGreet)
     greetd.fprintAuth = true;
-
-    # lock screen
-    swaylock.fprintAuth = true;
   };
 }
\ No newline at end of file
diff --git a/modules/core/greetd/default.nix b/modules/core/greetd/default.nix
index 2290751..f31c3b8 100644
--- a/modules/core/greetd/default.nix
+++ b/modules/core/greetd/default.nix
@@ -1,8 +1,9 @@
 { pkgs, username, ... }: {
-  environment.systemPackages = with pkgs; [
-    regreet
-    cage
-  ];
+  programs.regreet.enable = true;
+  programs.niri.enable = true;
+
+  environment.etc."regreet/config.ron".source = ./config.ron;
+  environment.etc."greetd/niri.kdl".source = ./niri.kdl;
 
   services.greetd = {
     enable = true;
@@ -10,10 +11,11 @@
     settings = {
       default_session = {
         user = "greeter";
-        command = "${pkgs.cage}/bin/cage -s -- ${pkgs.regreet}/bin/regreet --time --remember --cmd niri-session";
+        command = "${pkgs.niri}/bin/niri --config /etc/greetd/niri.kdl";
       };
     };
   };
+  programs.regreet.enable = true;
 
   environment.etc."regreet/config.ron".source = ./config.ron;
 }
diff --git a/modules/core/greetd/niri.kdl b/modules/core/greetd/niri.kdl
new file mode 100644
index 0000000..6ea5729
--- /dev/null
+++ b/modules/core/greetd/niri.kdl
@@ -0,0 +1,10 @@
+spawn-sh-at-startup "regreet; niri msg action quit --skip-confirmation"
+
+hotkey-overlay {
+  skip-at-startup
+}
+
+cursor {
+  xcursor-theme "catppuccin-mocha-red-cursors"
+  xcursor-size 24
+}
\ No newline at end of file