diff --git a/docs/TODO.md b/docs/TODO.md
index df21f21..e47e456 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -1,5 +1,4 @@
-# Todolist
-
+# Todolist {
 feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 
 - [ ] Nixy
@@ -7,6 +6,7 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 
 - [ ] Clipse: clipboard manager
 - [ ] Walker launcher implementation
+- [ ] Swaync implementation
 
 - [ ] Qutebrowser
   - [ ] !!! Bitwarden integration (I need this.)
@@ -27,10 +27,8 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 
 ## Server
 
-- [ ] Server configuration is actually broken, need to update with the new modules
 - [ ] Jackflix V2
   - Backup Radarr, Prowlarr, Sonarr config
   - Take a look into buildarr or build a custom solution with *arr apis
-- [ ] Bitcoin-git: to test
-- [ ] Ntfy auth file
+- [ ] Bitcoin-git: broken
 - [ ] Secrets mode 0444: not secure
diff --git a/flake.lock b/flake.lock
index 4422d02..f148296 100644
--- a/flake.lock
+++ b/flake.lock
@@ -129,27 +129,6 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "vpnconfinement",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717285511,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -572,22 +551,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1717602782,
-        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -660,8 +623,7 @@
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
         "sops-nix": "sops-nix",
-        "spicetify-nix": "spicetify-nix",
-        "vpnconfinement": "vpnconfinement"
+        "spicetify-nix": "spicetify-nix"
       }
     },
     "sf-arabic": {
@@ -820,25 +782,6 @@
         "type": "github"
       }
     },
-    "vpnconfinement": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1718924235,
-        "narHash": "sha256-lu78iQzZGBE9bIvlYgbBYiJ85wR5zSBUPjIQkg6cRQc=",
-        "owner": "Maroka-chan",
-        "repo": "VPN-Confinement",
-        "rev": "790f70888c69d55c92442e702647dc619dd7bc61",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Maroka-chan",
-        "repo": "VPN-Confinement",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
diff --git a/home/system/swaync/default.nix b/home/system/swaync/default.nix
new file mode 100644
index 0000000..b1147fc
--- /dev/null
+++ b/home/system/swaync/default.nix
@@ -0,0 +1,119 @@
+{ pkgs, config, ... }: {
+  home.packages = with pkgs; [ libnotify ];
+
+  services.swaync = {
+    enable = true;
+    settings = {
+      positionX = "right";
+      positionY = "top";
+
+      control-center-margin-top = 15;
+      control-center-margin-bottom = 15;
+      control-center-margin-right = 15;
+      control-center-margin-left = 15;
+
+      notification-icon-size = 32;
+      notification-body-image-height = 50;
+      notification-body-image-width = 50;
+
+      timeout-low = 5;
+      timeout = 10;
+      timeout-critical = 0;
+
+      fit-to-screen = true;
+      control-center-width = 500;
+      notification-window-width = 400;
+
+      keyboard-shortcuts = true;
+      image-visibility = "when-available";
+
+      transition-time = 200;
+      hide-on-clear = false;
+      hide-on-action = true;
+      script-fail-notify = true;
+
+      widgets = [
+        "inhibitors"
+        "title"
+        "buttons-grid"
+        "mpris"
+        "volume"
+        "backlight"
+        "dnd"
+        "notifications"
+      ];
+
+      widget-config = {
+        title = {
+          text = "Notification Center";
+          clear-all-button = true;
+          button-text = "󰆴 Clear All";
+        };
+        dnd = { text = "Do Not Disturb"; };
+        # label = {
+        #   max-lines = 1;
+        #   text = "Notification Center";
+        # };
+        mpris = {
+          image-size = 96;
+          image-radius = 7;
+        };
+        volume = { label = "󰕾"; };
+        backlight = { label = "󰃟"; };
+        "buttons-grid" = {
+          "actions" = [
+            {
+              "label" = "󰐥";
+              "command" = "systemctl poweroff";
+            }
+            {
+              "label" = "󰜉";
+              "command" = "systemctl reboot";
+            }
+            {
+              "label" = "󰒲";
+              "command" = "systemctl suspend";
+            }
+            {
+              "label" = "󰌾";
+              "command" = "${pkgs.hyprlock}/bin/hyprlock";
+            }
+            {
+              "label" = "󰍃";
+              "command" = "${pkgs.hyprland}/bin/hyprctl dispatch exit";
+            }
+            {
+              "label" = "󰕾";
+              "command" =
+                "${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
+            }
+            {
+              "label" = "󰍬";
+              "command" =
+                "${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
+            }
+            {
+              "label" = "󰂯";
+              "command" = "${pkgs.blueman}/bin/blueman-manager";
+            }
+            {
+              "label" = "󰹑";
+              "command" =
+                "${pkgs.grimblast}/bin/grimblast --notify --freeze --wait 1 copysave area ~/Pictures/$(date +%Y-%m-%dT%H%M%S).png";
+            }
+            {
+              "label" = "";
+              "command" = "${pkgs.kooha}/bin/kooha";
+            }
+          ];
+        };
+      };
+    };
+
+    style = ''
+      * {
+        font-family: ${config.var.theme.font};
+      }
+    '';
+  };
+}
diff --git a/home/system/waybar/default.nix b/home/system/waybar/default.nix
index b7284d9..d64f986 100644
--- a/home/system/waybar/default.nix
+++ b/home/system/waybar/default.nix
@@ -34,12 +34,13 @@
         modules-center = [ "hyprland/workspaces" ];
         modules-right = [
           "tray"
-          "backlight"
-          "pulseaudio"
+          # "backlight"
+          # "pulseaudio"
           "custom/caffeine"
           "custom/night-shift"
           "battery"
           "clock"
+          "custom/notification"
           "custom/power"
         ];
 
@@ -117,6 +118,27 @@
           on-click = "menu";
         };
 
+        "custom/notification" = {
+          tooltip = false;
+          format = "{} {icon}";
+          "format-icons" = {
+            notification = "󱅫";
+            none = "";
+            "dnd-notification" = " ";
+            "dnd-none" = "󰂛";
+            "inhibited-notification" = " ";
+            "inhibited-none" = "";
+            "dnd-inhibited-notification" = " ";
+            "dnd-inhibited-none" = " ";
+          };
+          "return-type" = "json";
+          "exec-if" = "which swaync-client";
+          exec = "swaync-client -swb";
+          "on-click" = "sleep 0.1 && swaync-client -t -sw";
+          "on-click-right" = "sleep 0.1 && swaync-client -d -sw";
+          escape = true;
+        };
+
         battery = {
           format = "{capacity}% {icon}";
           "format-icons" = {
@@ -239,6 +261,7 @@
 
       #memory,
       #custom-power,
+      #custom-notification,
       #custom-caffeine,
       #custom-night-shift,
       #battery,
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 65ee123..19ade85 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -21,7 +21,7 @@
     ../../home/scripts # All scripts
 
     # System (Desktop environment like stuff)
-    ../../home/system/dunst
+    # ../../home/system/dunst
     ../../home/system/gtk
     ../../home/system/zathura
     ../../home/system/hyprland
@@ -30,6 +30,7 @@
     ../../home/system/wofi
     ../../home/system/mime
     ../../home/system/udiskie
+    ../../home/system/swaync
 
     ./secrets # You should probably remove this line
   ];
@@ -48,6 +49,8 @@
       wireguard-tools
 
       # Dev
+      wails
+      pkg-config
       go
       cargo
       nodejs