diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix
index 4a2ff59..cdc5fde 100644
--- a/homeConfigurations/vinzenz/default.nix
+++ b/homeConfigurations/vinzenz/default.nix
@@ -7,11 +7,11 @@
     ./fuzzel.nix
     ./git.nix
     ./gnome.nix
-    ./mako.nix
     ./niri.nix
     ./ssh.nix
     ./starship.nix
     ./swaylock.nix
+    ./swaync.nix
     ./vscode.nix
     ./waybar.nix
     ./zsh.nix
@@ -88,5 +88,7 @@
       };
       "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
     };
+
+    services.trayscale.enable = true;
   };
 }
diff --git a/homeConfigurations/vinzenz/mako.nix b/homeConfigurations/vinzenz/mako.nix
deleted file mode 100644
index b8052a4..0000000
--- a/homeConfigurations/vinzenz/mako.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.mako.enable = true;
-}
diff --git a/homeConfigurations/vinzenz/swaync.nix b/homeConfigurations/vinzenz/swaync.nix
new file mode 100644
index 0000000..8221c5e
--- /dev/null
+++ b/homeConfigurations/vinzenz/swaync.nix
@@ -0,0 +1,6 @@
+{
+  services.swaync = {
+    enable = true;
+    settings = { };
+  };
+}
diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/vinzenz/waybar.nix
index 44d7099..4de0a61 100644
--- a/homeConfigurations/vinzenz/waybar.nix
+++ b/homeConfigurations/vinzenz/waybar.nix
@@ -26,7 +26,6 @@
         spacing = "8";
         modules-left = [
           "niri/workspaces"
-          "tray"
           "niri/window"
         ];
         modules-center = [
@@ -34,27 +33,40 @@
           "clock"
         ];
         modules-right = [
-          "mpris"
           #"image"
-          "gamemode"
-
-          "temperature"
-          "cpu"
-          "memory"
-          "disk"
-          "wireplumber"
-          "bluetooth"
-          "backlight"
-          "network"
-          "power-profiles-daemon"
-          "battery"
-          "idle_inhibitor"
+          "group/status-infos"
+          "tray"
+          "group/system-tray"
           "group/group-power"
         ];
+
+        "group/system-tray" = {
+          orientation = "inherit";
+          modules = [
+            "mpris"
+            "wireplumber"
+            "bluetooth"
+            "backlight"
+            "network"
+            "power-profiles-daemon"
+            "custom/swaync"
+            "idle_inhibitor"
+          ];
+        };
+        "group/status-infos" = {
+          orientation = "inherit";
+          modules = [
+            "battery"
+            "temperature"
+            "cpu"
+            "memory"
+            "disk"
+          ];
+        };
+
         "niri/workspaces" = {
           format = "{icon}";
         };
-
         "niri/window" = {
           separate-outputs = true;
           icon = true;
@@ -225,6 +237,29 @@
           tooltip-format-enumerate-connected = "{device_alias}\t{device_address}";
           tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%";
         };
+        "custom/swaync" =
+          let
+            swaync-client = "${lib.getBin config.services.swaync.package}/bin/swaync-client";
+          in
+          {
+            tooltip = true;
+            format = "{0}{icon} ";
+            format-icons = {
+              notification = "󱅫";
+              none = "󰂜";
+              dnd-notification = "󰂠";
+              dnd-none = "󰪓";
+              inhibited-notification = "󰂛";
+              inhibited-none = "󰪑";
+              dnd-inhibited-notification = "󰂛";
+              dnd-inhibited-none = "󰪑";
+            };
+            return-type = "json";
+            exec = "${swaync-client} --subscribe-waybar";
+            on-click = "${swaync-client} --toggle-panel --skip-wait";
+            on-click-right = "${swaync-client} --toggle-dnd --skip-wait";
+            escape = true;
+          };
       };
     };
   };