diff --git a/dots/doom/config.el b/dots/doom/config.el
index 4845580..46c684a 100644
--- a/dots/doom/config.el
+++ b/dots/doom/config.el
@@ -77,3 +77,6 @@
 ;;
 ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
 ;; they are implemented.
+
+(after! lsp-mode
+  (setq lsp-nix-nil-auto-archive t))
diff --git a/dots/hyprland.nix b/dots/hyprland.nix
index b212293..2eab1a7 100755
--- a/dots/hyprland.nix
+++ b/dots/hyprland.nix
@@ -11,7 +11,6 @@ let
   isLaptop = systemName == "laptop";
   isPc = systemName == "pc";
 
-  hypr-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
   hypr-portal =
     inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
   hypr-split =
@@ -29,7 +28,7 @@ in
 {
   wayland.windowManager.hyprland = {
     enable = window_manager == "hyprland" || window_manager == "all";
-    package = hypr-package;
+    package = null; # Use the system package from programs.hyprland to avoid duplicate sessions
     portalPackage = hypr-portal;
     plugins = [
       #pkgs.hyprlandPlugins.hyprsplit
@@ -51,9 +50,7 @@ in
       exec-once = [
         # "waybar"
         # "quickshell"
-        #"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
-        "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"
-        "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init"
+        "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
         "fcitx5 -d"
         "foot -s"
         "systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP QT_QPA_PLATFORMTHEME GTK_THEME"
diff --git a/dots/niri.nix b/dots/niri.nix
index cbca7c3..75a6185 100755
--- a/dots/niri.nix
+++ b/dots/niri.nix
@@ -89,10 +89,6 @@ in
       # Startup programs (aligned with hyprland exec-once)
       spawn-at-startup = [
         { command = [ "xwayland-satellite" ]; }
-        {
-          command = [ "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1" ];
-        }
-        { command = [ "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init" ]; }
         {
           command = [
             "fcitx5"
@@ -310,6 +306,16 @@ in
 
       # Window rules
       window-rules = [
+        #{
+        #  matches = [
+        #    { app-id = "firefox"; }
+        #    { app-id = "thunar"; }
+        #    { app-id = "vesktop"; }
+        #  ];
+        #  default-column-width = {
+        #    proportion = 0.95;
+        #  };
+        #}
         # Float file dialogs
         {
           matches = [
diff --git a/home/homePkgs.nix b/home/homePkgs.nix
index fbdb741..7e190d8 100755
--- a/home/homePkgs.nix
+++ b/home/homePkgs.nix
@@ -194,19 +194,6 @@ in
 
     # ─── KDE / File Management ───────────────────────────────────────────────────
     kdePackages.qt6ct
-    kdePackages.baloo # new
-    kdePackages.baloo-widgets # new
-    kdePackages.dolphin
-    kdePackages.ffmpegthumbs # new
-    kdePackages.kdegraphics-mobipocket # new
-    kdePackages.kdegraphics-thumbnailers # new
-    kdePackages.kdesdk-thumbnailers # new
-    kdePackages.kimageformats # new
-    kdePackages.kio
-    kdePackages.kio-extras
-    # kdePackages.breeze-icons
-    # kdePackages.dolphin-plugins
-    # kdePackages.kde-cli-tools
     # resvg # new
     adwaita-icon-theme
     hicolor-icon-theme
diff --git a/home/services.nix b/home/services.nix
index fa21f29..bfe8ba6 100644
--- a/home/services.nix
+++ b/home/services.nix
@@ -8,5 +8,8 @@
 }:
 
 {
-  # User services can be added here
+  services.gnome-keyring = {
+    enable = true;
+    components = [ "pkcs11" "secrets" "ssh" ];
+  };
 }
diff --git a/result b/result
new file mode 120000
index 0000000..2dbf1a4
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/3g1dr7pqhswjv3m9pd979rh02f37rfja-nixos-system-mrfluffyPC-26.05.20260123.c5296fd
\ No newline at end of file
diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix
index 7d44dd3..f0f04f5 100755
--- a/system/nixOSPkgs.nix
+++ b/system/nixOSPkgs.nix
@@ -114,11 +114,6 @@ in
     virt-manager.enable = true;
     corectrl.enable = true;
 
-    opengamepadui = {
-      enable = true;
-      gamescopeSession.enable = true;
-    };
-
     steam = {
       enable = true;
       remotePlay.openFirewall = true;
@@ -216,10 +211,8 @@ in
     hunspell
     hunspellDicts.en_US
 
-    # --- KDE Wallet bits ---
-    kdePackages.kwallet
-    kdePackages.kwalletmanager
-    kdePackages.kwallet-pam
+    # --- GNOME Keyring ---
+    gnome-keyring
 
     # --- Apps ---
     git
diff --git a/system/services.nix b/system/services.nix
index 4d65086..589359d 100755
--- a/system/services.nix
+++ b/system/services.nix
@@ -12,8 +12,6 @@ let
 in
 {
   # ─── Desktop & Input ───────────────────────────────────────────────────────
-  services.xserver.windowManager.fvwm2.gestures = true;
-
   # Enable touchpad support (enabled by default in most desktop managers).
   services.libinput = {
     enable = true;
@@ -52,19 +50,6 @@ in
       };
   };
 
-  # ─── Nice Shit ──────────────────────────────────────────────────────────────
-  services.ananicy = {
-    enable = true;
-    package = pkgs.ananicy-cpp;
-    rulesProvider = pkgs.ananicy-cpp;
-    extraRules = [
-      {
-        "name" = "gamescope";
-        "nice" = -20;
-      }
-    ];
-  };
-
   services.blueman.enable = true;
   services.accounts-daemon.enable = true;
 
diff --git a/system/specialisation/main-system.nix b/system/specialisation/main-system.nix
index 609f1c7..7fb7d87 100644
--- a/system/specialisation/main-system.nix
+++ b/system/specialisation/main-system.nix
@@ -91,7 +91,7 @@ in
     pam.services = {
       swaylock = { };
       greetd.enableGnomeKeyring = true;
-      greetd.kwallet.enable = true;
+      login.enableGnomeKeyring = true;
     };
   };