diff --git a/home-manager/home.nix b/home-manager/home.nix
index 53cee9e..198400c 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -7,6 +7,8 @@
   imports = [
     inputs.anyrun.homeManagerModules.default
     ./hyprland.nix
+    ./waybar.nix
+    ./swaync.nix
   ];
 
   # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed
@@ -31,32 +33,6 @@
   programs.home-manager.enable = true;
 
   programs.tmux.enable = true;
-  
-  programs.waybar = {
-    enable = true;
-    systemd.enable = false;
-    settings = {
-      mainBar = {
-        layer = "top";
-        position = "top";
-        height = 30;
-        output = [
-          "eDP-2"
-          "DP-2"
-          "DP-3"
-        ];
-        modules-left = [ "wlr/workspaces" "wlr/mode" "wlr/taskbar" ];
-        modules-center = [ "wlr/window" "clock" ];
-        modules-right = [ "idle_inhibitor" "pulseaudio" "backlight" "battery" "tray" ];
-        "clock" = {
-          "format" = "{:%A %d %b %T}";
-#          "tooltip" = true;
-#          "tooltip-format" = "{=%A; %d %B %Y}\n<tt>{calendar}</tt>";
-          "interval" = 1;
-        };
-      };
-    };
-  };
 
   # Add support for bluetooth headset media controls
   services.mpris-proxy.enable = true;
diff --git a/home-manager/swaync.nix b/home-manager/swaync.nix
new file mode 100644
index 0000000..19e8de5
--- /dev/null
+++ b/home-manager/swaync.nix
@@ -0,0 +1,4 @@
+{config, pkgs, ...}:
+{
+  programs.swaync.enable = true;
+}
diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix
new file mode 100644
index 0000000..b94f483
--- /dev/null
+++ b/home-manager/waybar.nix
@@ -0,0 +1,48 @@
+{ config, pkgs, lib, inputs, ... }:
+{  
+  programs.waybar = {
+    enable = true;
+    systemd.enable = false;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+        output = [
+          "eDP-2"
+          "DP-2"
+          "DP-3"
+        ];
+        modules-left = [ "wlr/workspaces" "wlr/mode" "wlr/taskbar" ];
+        modules-center = [ "clock" "custom/swaync" ];
+        modules-right = [ "idle_inhibitor" "pulseaudio" "backlight" "battery" "tray" ];
+        "clock" = {
+          "format" = "{:%A %d %b %T}";
+#          "tooltip" = true;
+#          "tooltip-format" = "{=%A; %d %B %Y}\n<tt>{calendar}</tt>";
+          "interval" = 1;
+        };
+        "custom/swaync": {
+          "tooltip" = false;
+          "format"= "{icon}";
+          "format-icons" = {
+            "notification" = "<span foreground='red'><sup></sup></span>";
+            "none" = "";
+            "dnd-notification" = "<span foreground='red'><sup></sup></span>";
+            "dnd-none" = "";
+            "inhibited-notification" = "<span foreground='red'><sup></sup></span>";
+            "inhibited-none" = "";
+            "dnd-inhibited-notification" = "<span foreground='red'><sup></sup></span>";
+            "dnd-inhibited-none" = "";
+          };
+          "return-type" = "json";
+          "exec-if" = "which swaync-client";
+          "exec" = "swaync-client -swb";
+          "on-click" = "swaync-client -t -sw";
+          "on-click-right" = "swaync-client -d -sw";
+          "escape" = true;
+        };
+      };
+    };
+  };
+}