added new usb system, started modularizing

modules/home-manager/hypr/waybar.nix

@@ -1,4 +1,7 @@
-{inputs, pkgs, ...}:
+{inputs, pkgs, lib, config, ...}:
+let
+  cfg = config.nix-config.style;
+in
 {
     # required to autoload fonts from packages installed via Home Manager
     fonts.fontconfig.enable = true;
@@ -14,14 +17,16 @@
         settings = {
 
             mainBar = {
-                margin-top = 2;
-                margin-bottom = 2;
-                margin-left = 5;
-                margin-right = 5;
-
                 layer = "top";
                 position = "top";
-                spacing = 5;
+
+                margin-top = 5;
+                # margin-bottom = 2;
+                # margin-left = 5;
+                # margin-right = 5;
+
+                # margin between the modules
+                spacing = 2;
 
                 modules-left = [
                     "hyprland/workspaces"
@@ -36,8 +41,8 @@
                 modules-right = [
                     "tray"
                     "privacy"
-                    "wireplumber"
                     "network"
+                    "wireplumber"
                     "battery"
                     "backlight"
                     "idle_inhibitor"
@@ -150,18 +155,29 @@
                     return-type = "json";
                     exec-if = "which swaync-client";
                     exec = "swaync-client -swb";
-                    on-click = "sleep 0.1 && task-waybar";
+                    on-click = "swaync-client -t -sw";
+                    on-click-right = "swaync-client -d -sw";
                     escape = true;
                 };
                 "network" = {
                     format =  "󰤭";
-                    format-wifi = "{icon} {essid}";
+                    format-ethernet = " {ipaddr}";
+                    format-wifi = "{icon}";
                     format-icons = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
-                    format-ethernet = "󰊗 {ipaddr}/{cidr}";
-                    format-disconnected = "";
-                    tooltip-format = "󰊗 {ifname} via {gwaddr}";
-                    tooltip-format-wifi = "SSID: {essid}({signalStrength}%), {frequency} MHz\nInterface: {ifname}\nIP: {ipaddr}\nGW: {gwaddr}\n\n<span color='#a6da95'>{bandwidthUpBits}</span>\t<span color='#ee99a0'>{bandwidthDownBits}</span>\t<span color='#c6a0f6'>󰹹{bandwidthTotalBits}</span>";
-                    tooltip-format-ethernet = "{ifname} ";
+                    format-disconnected = "󰤭";
+                    tooltip-format = " {ifname} via {gwaddr}";
+                    # TODO - don't escape the strings in the tooltip
+                    tooltip-format-wifi = ''
+                        󰤨 {essid}({signalStrength}%), {frequency} GHz\nInterface: {ifname}
+                        IP: {ipaddr}    GW: {gwaddr}
+
+                        <span color='#a6da95'>{bandwidthUpBits}</span> <span color='#ee99a0'>{bandwidthDownBits}</span>    <span color='#c6a0f6'>󰹹{bandwidthTotalBits}</span>
+                    '';
+                    tooltip-format-ethernet = ''
+                         {ifname} - {ipaddr}/{cidr}
+
+                        <span color='#a6da95'>{bandwidthUpBits}</span> <span color='#ee99a0'>{bandwidthDownBits}</span>    <span color='#c6a0f6'>󰹹{bandwidthTotalBits}</span>
+                    '';
                     tooltip-format-disconnected = "Disconnected";
                     on-click = "XDG_CURRENT_DESKTOP=GNOME gnome-control-center wifi";
                 };
@@ -192,22 +208,20 @@
 
         style = ''
             * {
-                font-family: "FiraCode Nerd Font";
+                font-family: "${cfg.monospaceFont}";
                 font-weight: bold;
-                font-size: 20px;
+                font-size: ${builtins.toString (cfg.fontSizes.desktop + 7)}px;
             }
 
             window#waybar {
                 background-color: transparent;
             }
 
-
             .module {
                 background: rgba(0, 0, 0, 0.6);
                 color: white;
                 border-radius: 7px;
                 padding: 5px 5px 5px 5px;
-                margin: 5px 0;
             }
             box.module button:hover {
                 box-shadow: inset 0 -3px #ffffff;