From db8b009638b01e24b315b2b1c2d195782409b239 Mon Sep 17 00:00:00 2001
From: Bernardo Magri <bernardo@bernardomagri.eu>
Date: Mon, 6 Apr 2026 21:40:50 +0100
Subject: [PATCH] refactor: unify Waybar configuration using Nix and fix legacy
 paths

---
 config/waybar/config.jsonc |  4 ++--
 modules/home/waybar.nix    | 40 +-------------------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index a9f79ad..cc1723c 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -40,7 +40,7 @@
     }
   },
   "custom/nomarchy": {
-    "format": "<span font='nomarchy'>\ue900</span>",
+    "format": "<span font='nomarchy'>a</span>",
     "on-click": "nomarchy-menu",
     "on-click-right": "xdg-terminal-exec",
     "tooltip-format": "Nomarchy Menu\n\nSuper + Alt + Space"
@@ -150,7 +150,7 @@
   },
   "custom/notification-silencing-indicator": {
     "on-click": "nomarchy-toggle-notification-silencing",
-    "exec": "$OMARCHY_PATH/default/waybar/indicators/notification-silencing.sh",
+    "exec": "~/.config/nomarchy/default/waybar/indicators/notification-silencing.sh",
     "signal": 10,
     "return-type": "json"
   },
diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix
index 802a73b..2d70e1a 100644
--- a/modules/home/waybar.nix
+++ b/modules/home/waybar.nix
@@ -39,44 +39,6 @@
       #tray { margin-right: 16px; }
       #bluetooth { margin-right: 17px; }
     '';
-    settings = [{
-      layer = "top";
-      position = "top";
-      height = 26;
-      spacing = 0;
-      modules-left = [ "custom/nomarchy" "hyprland/workspaces" ];
-      modules-center = [ "clock" "custom/update" "custom/voxtype" "custom/screenrecording-indicator" "custom/idle-indicator" "custom/notification-silencing-indicator" ];
-      modules-right = [ "group/tray-expander" "bluetooth" "network" "pulseaudio" "cpu" "battery" ];
-      "custom/nomarchy" = {
-        format = "<span font='nomarchy'>\ue900</span>";
-        on-click = "nomarchy-menu";
-        on-click-right = "xdg-terminal-exec";
-        tooltip-format = "Nomarchy Menu\n\nSuper + Alt + Space";
-      };
-      "hyprland/workspaces" = {
-        on-click = "activate";
-        format = "{icon}";
-        format-icons = {
-          default = "";
-          active = "󱓻";
-        };
-      };
-      "clock" = {
-        format = "{:%H:%M}";
-      };
-      "battery" = {
-        format = "{icon}  {capacity}%";
-        format-icons = ["" "" "" "" ""];
-      };
-      "pulseaudio" = {
-        format = "{icon}  {volume}%";
-        format-icons = ["" "" ""];
-      };
-      "network" = {
-        format-wifi = "  {essid}";
-        format-ethernet = "󰈀  {ipaddr}";
-        format-disconnected = "⚠  Disconnected";
-      };
-    }];
+    settings = [ (builtins.fromJSON (builtins.readFile ../../config/waybar/config.jsonc)) ];
   };
 }