diff --git a/config/home.nix b/config/home.nix
index 275d6a8..49c19f8 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -15,6 +15,16 @@ in {
     };
   };
 
+  xsession = {
+    enable = true;
+    initExtra = ''
+        eval $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+        export SSH_AUTH_SOCK
+    '';
+  };
+
+  services.gnome-keyring.enable = true;
+
   home = {
     username = "${username}";
     homeDirectory = "/home/${username}";
@@ -39,6 +49,7 @@ in {
         font-awesome
         gimp
         git
+        gnome.gnome-keyring
         grub2
         hack-font
         htop
@@ -63,9 +74,11 @@ in {
         os-prober
         pavucontrol
         picom
-        pm2
         plexamp
+        pm2
         polybar
+        polybar-pulseaudio-control
+        pulseaudio
         ranger
         rofi
         rofi-emoji
diff --git a/config/packages/polybar/config.ini b/config/packages/polybar/config.ini
index b7f0fbd..eb6f4c5 100644
--- a/config/packages/polybar/config.ini
+++ b/config/packages/polybar/config.ini
@@ -53,7 +53,7 @@ font-1 = Font Awesome 6 Free:style=Regular;2
 font-2 = Font Awesome 6 Free:style=Solid;2
 
 modules-left = xworkspaces xwindow
-modules-right = filesystem audiooutput pulseaudio xkeyboard memory cpu battery date
+modules-right = filesystem pulseaudio-control-output xkeyboard memory cpu battery date
 
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -114,14 +114,16 @@ label-volume = %percentage%%
 label-muted = muted
 label-muted-foreground = ${colors.disabled}
 
-[module/audiooutput]
+[module/pulseaudio-control-output]
 type = custom/script
-exec = cat ~/.cache/scripts/get-sink-name.txt 
-interval = 1
-format = <label>
-format-prefix = "OUT "
-format-prefix-foreground = ${colors.primary}
-label = %output%
+tail = true
+exec = pulseaudio-control --format 'VOL $VOL_LEVEL%' listen
+
+click-right = exec pavucontrol &
+click-left = pulseaudio-control togmute
+click-middle = pulseaudio-control next-node
+scroll-up = pulseaudio-control --volume-max 100 up
+scroll-down = pulseaudio-control --volume-max 100 down
 
 [module/xkeyboard]
 type = internal/xkeyboard
diff --git a/system/shared.nix b/system/shared.nix
index 6df1bca..81c2cbd 100644
--- a/system/shared.nix
+++ b/system/shared.nix
@@ -43,12 +43,16 @@
 
   i18n.defaultLocale = "en_GB.UTF-8";
 
-  security.rtkit.enable = true;
+  security = {
+      rtkit.enable = true;
+      pam.services.lightdm.enableGnomeKeyring = true;
+  };
 
   services = {
     flatpak.enable = true;
     dbus.enable = true;
     picom.enable = true;
+    gnome.gnome-keyring.enable = true;
     
     pipewire = {
         enable = true;
@@ -59,9 +63,16 @@
 
     xserver = {
       enable = true;
-      windowManager.i3.enable = true;
       xkb.layout = "us";
 
+      windowManager.i3 = {
+        enable = true;
+        extraSessionCommands = ''
+            eval $(${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon --daemonize --components=ssh,secrets)
+            export SSH_AUTH_SOCK
+        '';
+      };
+
       displayManager = {
         lightdm.enable = true;
         lightdm.greeters.gtk.enable = true;
@@ -124,6 +135,7 @@
 
   environment.systemPackages = with pkgs; [
     docker
+    gnome.gnome-keyring
   ];
 
   virtualisation.docker.enable = true;