diff --git a/config/home.nix b/config/home.nix
index 534e2eb..49c19f8 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -15,6 +15,14 @@ in {
     };
   };
 
+  xsession = {
+    enable = true;
+    initExtra = ''
+        eval $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+        export SSH_AUTH_SOCK
+    '';
+  };
+
   services.gnome-keyring.enable = true;
 
   home = {
diff --git a/system/shared.nix b/system/shared.nix
index 2862258..81c2cbd 100644
--- a/system/shared.nix
+++ b/system/shared.nix
@@ -52,6 +52,7 @@
     flatpak.enable = true;
     dbus.enable = true;
     picom.enable = true;
+    gnome.gnome-keyring.enable = true;
     
     pipewire = {
         enable = true;
@@ -64,8 +65,6 @@
       enable = true;
       xkb.layout = "us";
 
-      desktopManager.gnome.enable = true;
-
       windowManager.i3 = {
         enable = true;
         extraSessionCommands = ''
@@ -136,6 +135,7 @@
 
   environment.systemPackages = with pkgs; [
     docker
+    gnome.gnome-keyring
   ];
 
   virtualisation.docker.enable = true;