finalise waybar (i think)

1 files changed, 42 insertions, 16 deletions

diff --git a/modules/user/desktop/swayfx.nix b/modules/user/desktop/swayfx.nix
index 9619e9a..54ed913 100644
--- a/modules/user/desktop/swayfx.nix
+++ b/modules/user/desktop/swayfx.nix
@@ -12,22 +12,32 @@
       enable = lib.mkDefault (config.desktop.windowManager == "swayfx");
       settings = {
         main = {
-          modules-left = [ "sway/workspaces" "tray" ];
+          modules-left = [
+            "sway/workspaces"
+            "tray"
+          ];
           modules-center = [ "clock" ];
           modules-right = [
             "backlight"
             "battery"
+            "wireplumber"
             "cpu"
             "memory"
             "network"
-            "wireplumber"
           ];
 
-          backlight.format = "{percent}% Brightness";
+          backlight = {
+            format = "{icon}";
+            format-icons = [ "" "󰖨" ];
+            tooltip-format = "{percent}%";
+          };
+
           battery = {
-            format = "{capacity}% BAT";
-            format-critical = "!! {capacity}% BAT !!";
+            format = "{icon}";
+            format-critical = "!! {capacity}% {icon} !!";
+            format-icons = [ "" "" "" "" ];
             format-time = "{H}h{m}m";
+            format-warning = "{icon} ({capacity}%)";
             states = {
               critical = 15;
               warning = 25;
@@ -58,36 +68,50 @@
           };
 
           memory = {
-            format = "{percentage}% RAM";
+            format = "{used}/{total} GiB";
             states = {
               critical = 90;
               warning = 70;
             };
 
-            tooltip-format = "{used}/{total} GiB";
+            tooltip-format = "{percentage}% used";
           };
 
           network = {
-            format-disabled = "Interface disabled";
-            format-disconnected = "No network";
-            format-ethernet = "{ifname} ({ipaddr}/{cidr})";
-            format-wifi = "{essid} ({signalStrength}%)";
+            format-disabled = "󰀝";
+            format-disconnected = "󰌙";
+            format-ethernet = "󰌗 {ipaddr}/{cidr}";
+            format-icons = [ "󰤟" "󰤢" "󰤥" "󰤨" ];
+            format-wifi = "{essid} {icon}";
             interval = 15;
-            tooltip-format = "tx: {bandwidthUpBytes} rx: {bandwidthDownBytes}";
-            tooltip-format-wifi = "{ifname} ({ipaddr}/{cidr}) tx: {bandwidthUpBytes} rx: {bandwidthDownBytes}";
+            tooltip-format = "{ifname} tx: {bandwidthUpBytes} rx: {bandwidthDownBytes}";
+            tooltip-format-wifi = "{ifname} ({ipaddr}/{cidr}) {signalStrength}% tx: {bandwidthUpBytes} rx: {bandwidthDownBytes}";
           };
 
           position = "bottom";
           "sway/workspaces" = {
             all-outputs = true;
             disable-scroll = true;
-            format = "•";
+            format = "";
+            persistent-workspaces = {
+              "1" = [];
+              "2" = [];
+              "3" = [];
+              "4" = [];
+              "5" = [];
+              "6" = [];
+              "7" = [];
+              "8" = [];
+              "9" = [];
+            };
           };
 
           wireplumber = {
-            format = "{volume}% VOL";
-            format-muted = "Muted";
+            format = "{icon}";
+            format-icons = [ "󰕿" "󰖀" "󰕾" ];
+            format-muted = "󰸈";
             on-click = "wpctl set-mute @DEFAULT_SINK@ toggle";
+            tooltip-format = "{node_name} - {volume}%";
           };
         };
       };
@@ -259,6 +283,8 @@
             corner_radius 10
             shadows enable
             shadow_inactive_color #00000000
+
+            exec waybar
           '';
         }
       else