finalise waybar (i think)

3 files changed, 62 insertions, 23 deletions

diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index a72069b..c7bde74 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -19,6 +19,7 @@
   };
 
   config = {
+    fonts.fontconfig.enable = true;
     home = {
       file."Pictures/blossoms.jpg" = {
         enable = (config.desktop.windowManager != null);
@@ -27,7 +28,8 @@
 
       packages = with pkgs; [
         brightnessctl
-        fira-code # monospace font
+        fira-code
+        nerd-fonts.fira-code # monospace font
       ];
     };
 
@@ -67,7 +69,7 @@
           cursor.blink = true;
           main = {
             dpi-aware = true;
-            font = "Fira Code:size=8";
+            font = "FiraCode Nerd Font Mono:size=8";
           };
 
           mouse.hide-when-typing = true;
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
diff --git a/modules/user/desktop/waybar.css b/modules/user/desktop/waybar.css
index 8fa6fc8..0f71c17 100644
--- a/modules/user/desktop/waybar.css
+++ b/modules/user/desktop/waybar.css
@@ -1,7 +1,7 @@
 * {
     border: none;
     border-radius: 0;
-    font-family: Fira Code;
+    font-family: 'FiraCode Nerd Font Mono';
     min-height: 0;
 }
 
@@ -21,14 +21,13 @@ tooltip label {
 
 #workspaces button {
     background: none;
-    box-shadow: none;
     color: #6e6a86;
-    font-weight: bold;
     padding: 0;
 }
 
 #workspaces button:hover {
     color: #e0def4;
+    text-shadow: inherit;
 }
 
 #workspaces button.visible {
@@ -44,14 +43,14 @@ tooltip label {
 }
 
 .module {
-    padding: 0 4px;
+    padding: 0 8px;
+    padding-top: 2px;
 }
 
 .modules-left, .modules-center, .modules-right {
     background: rgba(25, 23, 36, 0.8);
     border-top-left-radius: 10px;
     border-top-right-radius: 10px;
-    padding: 4px;
 }
 
 .modules-left {
@@ -63,3 +62,15 @@ tooltip label {
     margin-left: 4px;
     margin-right: 8px;
 }
+
+#cpu {
+    box-shadow: inset 0 -2px #ebbcba;
+}
+
+#memory {
+    box-shadow: inset 0 -2px #f6c177;
+}
+
+#network {
+    box-shadow: inset 0 -2px #c4a7e7;
+}