diff --git a/hosts/dnsc-machine/default.nix b/hosts/dnsc-machine/default.nix
index 963cd72..fe18dc5 100644
--- a/hosts/dnsc-machine/default.nix
+++ b/hosts/dnsc-machine/default.nix
@@ -75,8 +75,11 @@
     ];
   };
 
-  # Window Manager
+  # Window Manager Setup
   programs.niri.enable = true;
+  security.polkit.enable = true;
+  services.gnome.gnome-keyring.enable = true;
+  security.pam.services.swaylock = {};
 
   # Nix settings
   nix.gc = {
diff --git a/modules/wm/niri/default.nix b/modules/wm/niri/default.nix
index 0054b2f..7dc5c58 100644
--- a/modules/wm/niri/default.nix
+++ b/modules/wm/niri/default.nix
@@ -4,7 +4,6 @@
 
   # Additional setup
   services.polkit-gnome.enable = true;
-  services.gnome.gnome-keyring.enable = true;
 
   # WM Utilities (split out if they need additional config)
   programs.fuzzel.enable = true;