diff --git a/config/home.nix b/config/home.nix
index 49c19f8..275d6a8 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -15,16 +15,6 @@ 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}";
@@ -49,7 +39,6 @@ in {
         font-awesome
         gimp
         git
-        gnome.gnome-keyring
         grub2
         hack-font
         htop
@@ -74,11 +63,9 @@ in {
         os-prober
         pavucontrol
         picom
-        plexamp
         pm2
+        plexamp
         polybar
-        polybar-pulseaudio-control
-        pulseaudio
         ranger
         rofi
         rofi-emoji
diff --git a/config/packages/polybar/config.ini b/config/packages/polybar/config.ini
index eb6f4c5..b7f0fbd 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 pulseaudio-control-output xkeyboard memory cpu battery date
+modules-right = filesystem audiooutput pulseaudio xkeyboard memory cpu battery date
 
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -114,16 +114,14 @@ label-volume = %percentage%%
 label-muted = muted
 label-muted-foreground = ${colors.disabled}
 
-[module/pulseaudio-control-output]
+[module/audiooutput]
 type = custom/script
-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
+exec = cat ~/.cache/scripts/get-sink-name.txt 
+interval = 1
+format = <label>
+format-prefix = "OUT "
+format-prefix-foreground = ${colors.primary}
+label = %output%
 
 [module/xkeyboard]
 type = internal/xkeyboard
diff --git a/system/shared.nix b/system/shared.nix
index 81c2cbd..6df1bca 100644
--- a/system/shared.nix
+++ b/system/shared.nix
@@ -43,16 +43,12 @@
 
   i18n.defaultLocale = "en_GB.UTF-8";
 
-  security = {
-      rtkit.enable = true;
-      pam.services.lightdm.enableGnomeKeyring = true;
-  };
+  security.rtkit.enable = true;
 
   services = {
     flatpak.enable = true;
     dbus.enable = true;
     picom.enable = true;
-    gnome.gnome-keyring.enable = true;
     
     pipewire = {
         enable = true;
@@ -63,16 +59,9 @@
 
     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;
@@ -135,7 +124,6 @@
 
   environment.systemPackages = with pkgs; [
     docker
-    gnome.gnome-keyring
   ];
 
   virtualisation.docker.enable = true;