diff --git a/machines/renge/services/nitter.nix b/machines/renge/services/nitter.nix
index a2c697f..63a0a91 100644
--- a/machines/renge/services/nitter.nix
+++ b/machines/renge/services/nitter.nix
@@ -5,7 +5,7 @@ in
 {
   services.nitter = {
     enable = true;
-    package = pkgs.unstable.nitter;
+    #package = pkgs.unstable.nitter;
     server = {
       port = 8081;
       hostname = "nitter.sbruder.xyz";
diff --git a/users/simon/modules/programs.nix b/users/simon/modules/programs.nix
index 55eac88..86cdb57 100644
--- a/users/simon/modules/programs.nix
+++ b/users/simon/modules/programs.nix
@@ -145,15 +145,7 @@ in
     # communication
     claws-mail # email client that looks ugly but just works
     firefox-esr # a bad browser
-    ((mumble.override { pulseSupport = true; }).overrideAttrs (o: o // {
-      patches = o.patches ++ [
-        # TODO: remove patch once stable release supports this
-        (pkgs.fetchpatch {
-          url = "https://github.com/mumble-voip/mumble/commit/03dbea56f650bba4f1aa0c54d02b6e8c3639d04f.patch";
-          sha256 = "1zmqb8gl2cp0mcw85x9wn5rjw2mih7d2x96jxxqabjcx1kvgyhh3";
-        })
-      ];
-    })) # VoIP group chat
+    mumble # VoIP group chat
 
     # creative/design
     openscad # parametric/procedural 3d modelling
diff --git a/users/simon/modules/sway/default.nix b/users/simon/modules/sway/default.nix
index 3478178..6d4cc09 100644
--- a/users/simon/modules/sway/default.nix
+++ b/users/simon/modules/sway/default.nix
@@ -170,7 +170,7 @@ in
         "--no-repeat --locked ${cfg.modifier}+q" = ''exec 'test $(swaymsg -t get_outputs | ${pkgs.jq}/bin/jq "[.[].dpms] | any") = "true" && swaymsg "output * dpms off" || swaymsg "output * dpms on"'';
 
         # Notifications
-        "${cfg.modifier}+n" = "exec ${pkgs.unstable.swaynotificationcenter}/bin/swaync-client -t";
+        "${cfg.modifier}+n" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t";
       };
 
       bars = [ ]; # managed as systemd user unit
diff --git a/users/simon/modules/sway/swaync.nix b/users/simon/modules/sway/swaync.nix
index 8ddd777..e54806f 100644
--- a/users/simon/modules/sway/swaync.nix
+++ b/users/simon/modules/sway/swaync.nix
@@ -8,7 +8,7 @@ in
     Install.WantedBy = [ "sway-session.target" ];
 
     Service = {
-      ExecStart = "${pkgs.unstable.swaynotificationcenter}/bin/swaync";
+      ExecStart = "${pkgs.swaynotificationcenter}/bin/swaync";
       Restart = "on-failure";
     };
   };
diff --git a/users/simon/modules/sway/waybar.nix b/users/simon/modules/sway/waybar.nix
index bcb2b88..629c526 100644
--- a/users/simon/modules/sway/waybar.nix
+++ b/users/simon/modules/sway/waybar.nix
@@ -285,9 +285,9 @@ in
         dnd-none = "${thinsp}";
       };
       return-type = "json";
-      exec = "${pkgs.unstable.swaynotificationcenter}/bin/swaync-client -swb";
-      on-click = "${pkgs.unstable.swaynotificationcenter}/bin/swaync-client -t -sw";
-      on-click-right = "${pkgs.unstable.swaynotificationcenter}/bin/swaync-client -d -sw";
+      exec = "${pkgs.swaynotificationcenter}/bin/swaync-client -swb";
+      on-click = "${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
+      on-click-right = "${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw";
       escape = true;
     };
   };
@@ -314,14 +314,5 @@ in
     };
   };
 
-  # TODO: remove when https://github.com/nix-community/home-manager/issues/2064
-  # is resolved
-  systemd.user.targets.tray = {
-    Unit = {
-      Description = "Home Manager System Tray";
-      Requires = [ "graphical-session-pre.target" ];
-    };
-  };
-
   services.blueman-applet.enable = lib.mkIf nixosConfig.sbruder.full true;
 }
diff --git a/users/simon/modules/zsh/default.nix b/users/simon/modules/zsh/default.nix
index 90933f9..321401c 100644
--- a/users/simon/modules/zsh/default.nix
+++ b/users/simon/modules/zsh/default.nix
@@ -54,7 +54,6 @@ in
       enable = true;
       nix-direnv = {
         enable = true;
-        enableFlakes = true;
       };
     };
     nix-index.enable = true;