refactor: unify Waybar configuration using Nix and fix legacy paths

This commit is contained in:
Bernardo Magri
2026-04-06 21:40:50 +01:00
parent 3e1b1efa6f
commit db8b009638
2 changed files with 3 additions and 41 deletions

View File

@@ -40,7 +40,7 @@
} }
}, },
"custom/nomarchy": { "custom/nomarchy": {
"format": "<span font='nomarchy'>\ue900</span>", "format": "<span font='nomarchy'>a</span>",
"on-click": "nomarchy-menu", "on-click": "nomarchy-menu",
"on-click-right": "xdg-terminal-exec", "on-click-right": "xdg-terminal-exec",
"tooltip-format": "Nomarchy Menu\n\nSuper + Alt + Space" "tooltip-format": "Nomarchy Menu\n\nSuper + Alt + Space"
@@ -150,7 +150,7 @@
}, },
"custom/notification-silencing-indicator": { "custom/notification-silencing-indicator": {
"on-click": "nomarchy-toggle-notification-silencing", "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, "signal": 10,
"return-type": "json" "return-type": "json"
}, },

View File

@@ -39,44 +39,6 @@
#tray { margin-right: 16px; } #tray { margin-right: 16px; }
#bluetooth { margin-right: 17px; } #bluetooth { margin-right: 17px; }
''; '';
settings = [{ settings = [ (builtins.fromJSON (builtins.readFile ../../config/waybar/config.jsonc)) ];
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";
};
}];
}; };
} }