From de330e6334db6978f64cf74072d7554997fe1f57 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Fri, 14 Nov 2025 02:05:29 +0100
Subject: [PATCH 1/4] waybar: move notifications to middle

---
 homeConfigurations/vinzenz/swaync.nix |  4 +++-
 homeConfigurations/vinzenz/waybar.nix | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/homeConfigurations/vinzenz/swaync.nix b/homeConfigurations/vinzenz/swaync.nix
index 8221c5e..9cf6c56 100644
--- a/homeConfigurations/vinzenz/swaync.nix
+++ b/homeConfigurations/vinzenz/swaync.nix
@@ -1,6 +1,8 @@
 {
   services.swaync = {
     enable = true;
-    settings = { };
+    settings = {
+      positionX = "center";
+    };
   };
 }
diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/vinzenz/waybar.nix
index a26ed9d..87cfb21 100644
--- a/homeConfigurations/vinzenz/waybar.nix
+++ b/homeConfigurations/vinzenz/waybar.nix
@@ -26,16 +26,17 @@
         spacing = "8";
         modules-left = [
           "niri/workspaces"
+          "tray"
           "niri/window"
         ];
         modules-center = [
           "privacy"
           "clock"
+          "custom/swaync"
         ];
         modules-right = [
           #"image"
           "group/status-infos"
-          "tray"
           "group/system-tray"
           "group/group-power"
         ];
@@ -49,7 +50,6 @@
             "backlight"
             "network"
             "power-profiles-daemon"
-            "custom/swaync"
             "idle_inhibitor"
           ];
         };
@@ -136,24 +136,28 @@
                   urgency ? null,
                   body ? null,
                   icon ? null,
+                  category ? null,
                 }:
                 let
                   body-part = if body != null then "'${body}'" else "";
                   urgency-part = if urgency != null then "--urgency ${urgency}" else "";
                   icon-part = if icon != null then "--icon ${icon}" else "";
+                  category-part = if category != null then "--category ${category}" else "";
                 in
-                "${lib.getBin pkgs.libnotify}/bin/notify-send ${urgency-part} ${icon-part} '${summary}' ${body-part}";
+                "${lib.getBin pkgs.libnotify}/bin/notify-send ${urgency-part} ${icon-part} ${category-part} '${summary}' ${body-part}";
             in
             {
               on-discharging-warning = mkNotifySendCommand {
                 summary = "Low Battery";
                 icon = "battery-caution";
+                category = "device";
               };
               on-discharging-critical = mkNotifySendCommand {
                 urgency = "critical";
                 summary = "Very Low Battery";
                 body = "Connect to power <i>now</i>!";
                 icon = "battery-low";
+                category = "device";
               };
             };
         };
@@ -287,7 +291,7 @@
           in
           {
             tooltip = true;
-            format = "{0}{icon} ";
+            format = "{icon}  {0} ";
             format-icons = {
               notification = "󱅫";
               none = "󰂜";

From 4bd718ca0477606c627b53c3e44fff48814c78a3 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Fri, 14 Nov 2025 22:15:40 +0100
Subject: [PATCH 2/4] swaylock: catppucchino theme

---
 homeConfigurations/vinzenz/swaylock.nix | 32 ++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/homeConfigurations/vinzenz/swaylock.nix b/homeConfigurations/vinzenz/swaylock.nix
index 2e298a6..08a5cd2 100644
--- a/homeConfigurations/vinzenz/swaylock.nix
+++ b/homeConfigurations/vinzenz/swaylock.nix
@@ -18,8 +18,38 @@
         show-failed-attempts = true;
         ignore-empty-password = true;
         grace = 3.5;
-        color = "000000";
         indicator-thickness = 20;
+
+        # https://github.com/catppuccin/swaylock/blob/main/themes/mocha.conf
+        color = "1e1e2e";
+        bs-hl-color = "f5e0dc";
+        caps-lock-bs-hl-color = "f5e0dc";
+        caps-lock-key-hl-color = "a6e3a1";
+        inside-color = "00000000";
+        inside-clear-color = "00000000";
+        inside-caps-lock-color = "00000000";
+        inside-ver-color = "00000000";
+        inside-wrong-color = "00000000";
+        key-hl-color = "a6e3a1";
+        layout-bg-color = "00000000";
+        layout-border-color = "00000000";
+        layout-text-color = "cdd6f4";
+        line-color = "00000000";
+        line-clear-color = "00000000";
+        line-caps-lock-color = "00000000";
+        line-ver-color = "00000000";
+        line-wrong-color = "00000000";
+        ring-color = "b4befe";
+        ring-clear-color = "f5e0dc";
+        ring-caps-lock-color = "fab387";
+        ring-ver-color = "89b4fa";
+        ring-wrong-color = "eba0ac";
+        separator-color = "00000000";
+        text-color = "cdd6f4";
+        text-clear-color = "f5e0dc";
+        text-caps-lock-color = "fab387";
+        text-ver-color = "89b4fa";
+        text-wrong-color = "eba0ac";
       };
     };
 

From 7eb0fbb69c03e6fb5399cbcfb80695f2bb07d591 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Fri, 14 Nov 2025 22:19:42 +0100
Subject: [PATCH 3/4] waync: activate more modules, smaller size

---
 homeConfigurations/vinzenz/swaync.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/homeConfigurations/vinzenz/swaync.nix b/homeConfigurations/vinzenz/swaync.nix
index 9cf6c56..93be775 100644
--- a/homeConfigurations/vinzenz/swaync.nix
+++ b/homeConfigurations/vinzenz/swaync.nix
@@ -1,8 +1,24 @@
+{ pkgs, ... }:
 {
   services.swaync = {
     enable = true;
     settings = {
+      "$schema" = "${pkgs.swaynotificationcenter}/etc/xdg/swaync/configSchema.json";
+
+      hide-on-clear = true;
+
       positionX = "center";
+      fit-to-screen = false;
+      control-center-height = 750;
+
+      widgets = [
+        "mpris"
+        "volume"
+        "title"
+        "dnd"
+        "inhibitors"
+        "notifications"
+      ];
     };
   };
 }

From dc9c268c4d765239785c476985cac59fe564052e Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Fri, 14 Nov 2025 22:20:00 +0100
Subject: [PATCH 4/4] niri: disable focus ring

---
 homeConfigurations/vinzenz/niri.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homeConfigurations/vinzenz/niri.nix b/homeConfigurations/vinzenz/niri.nix
index ba835c9..4213ec3 100644
--- a/homeConfigurations/vinzenz/niri.nix
+++ b/homeConfigurations/vinzenz/niri.nix
@@ -66,7 +66,7 @@
             urgent.gradient = gradient-urgent;
           };
           focus-ring = {
-            enable = true;
+            enable = false;
             active.gradient = gradient-active;
             inactive.gradient = gradient-inactive;
             urgent.gradient = gradient-urgent;