diff --git a/modules/home/services/default.nix b/modules/home/services/default.nix
index 17951bde..e00c6408 100644
--- a/modules/home/services/default.nix
+++ b/modules/home/services/default.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     ./easyeffects
-    ./gnome-keyring
     ./impermanence
     ./mpd
     ./playerctl
diff --git a/modules/home/services/gnome-keyring/default.nix b/modules/home/services/gnome-keyring/default.nix
deleted file mode 100644
index 3c2316b6..00000000
--- a/modules/home/services/gnome-keyring/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, lib, ... }:
-{
-  config = lib.mkIf config.home.desktop.enable {
-    services.gnome-keyring.enable = true;
-    home.persistence."/persist${config.home.homeDirectory}".directories = [ ".local/share/keyrings" ];
-  };
-}
diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix
index 5c758e3b..46243893 100644
--- a/modules/home/wms/programs/waybar/default.nix
+++ b/modules/home/wms/programs/waybar/default.nix
@@ -1,12 +1,12 @@
 { config, lib, pkgs, ... }:
 {
   programs.waybar = let
-    swayWorkspaceModule = {
+    workspaceModule = {
       format = "{name}";
-      sort-by-number = true;
       enable-bar-scroll = true;
-      warp-on-scroll = false;
       disable-scroll-wraparound = true;
+      numeric-first = true;
+      warp-on-scroll = false;
     };
 
     windowModule = {
@@ -36,10 +36,7 @@
       on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
       on-click-middle = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 100%";
       on-click-right = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 60%";
-      ignored-sinks = [
-        "Easy Effects Sink"
-        "USB FS AUDIO Analog Stereo"
-      ];
+      ignored-sinks = [ "Easy Effects Sink" ];
     };
 
     # Monitoring
@@ -228,10 +225,6 @@
         modules-left = [
           "sway/workspaces"
           "sway/window"
-          "niri/workspaces"
-          "niri/window"
-          "hyprland/workspaces"
-          "hyprland/window"
         ];
         modules-right = [
           "pulseaudio"
@@ -251,10 +244,8 @@
           "bluetooth"
           "network"
         ];
-        "sway/workspaces" = swayWorkspaceModule;
+        "sway/workspaces" = workspaceModule;
         "sway/window" = windowModule;
-        "niri/window" = windowModule;
-        "hyprland/window" = windowModule;
         "pulseaudio" = pulseModule;
         "mpd" = mpdModule;
         "custom/notifs" = notificationModule;
@@ -284,10 +275,6 @@
         modules-left = [
           "sway/workspaces"
           "sway/window"
-          "niri/workspaces"
-          "niri/window"
-          "hyprland/workspaces"
-          "hyprland/window"
         ];
         modules-right = [
           "pulseaudio"
@@ -296,10 +283,8 @@
           "custom/vram"
           "clock"
         ];
-        "sway/workspaces" = swayWorkspaceModule;
+        "sway/workspaces" = workspaceModule;
         "sway/window" = windowModule;
-        "niri/window" = windowModule;
-        "hyprland/window" = windowModule;
         "pulseaudio" = pulseModule;
         "mpd" = mpdModule;
         "custom/notifs" = notificationModule;
diff --git a/modules/system/services/general/default.nix b/modules/system/services/general/default.nix
index 95d3b81c..5b57ebba 100644
--- a/modules/system/services/general/default.nix
+++ b/modules/system/services/general/default.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     ./displaymanager
-    ./gnome-keyring
     ./keyd
     ./libvirtd
     ./portals
diff --git a/modules/system/services/general/gnome-keyring/default.nix b/modules/system/services/general/gnome-keyring/default.nix
deleted file mode 100644
index 6e91c3f3..00000000
--- a/modules/system/services/general/gnome-keyring/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ config, ... }:
-{
-  services.gnome.gnome-keyring.enable = config.system.desktop.enable;
-}