waybar updates

hosts/desktop/hyprland/config/waybar/default.nix

@@ -21,10 +21,12 @@
 
         modules-right = [
             "tray"
-            "custom/updates"
-            "hyprland/language"
+            # "custom/updates"
+            "keyboard-state#capslock"
+            "keyboard-state#numlock"
             "pulseaudio"
             "pulseaudio#microphone"
+            "network"
             "clock"
             "custom/weather"
         ];
@@ -42,11 +44,6 @@
             };
         };
 
-        "hyprland/language" = {
-            format = {};
-            format-en = "US";
-        };
-
         "custom/weather" = {
             tooltip  = true;
             format  = {};
@@ -62,7 +59,7 @@
 
         clock = {
             format = "{:%I:%M %p}";
-            tooltip-format = "<big>{ =%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+            tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
         };
 
         pulseaudio = {
@@ -93,9 +90,41 @@
             on-scroll-down = "pamixer --default-source -d 5";
             scroll-step = 5;
         };
+
+        network = {
+          interface = "wlp9s0";
+          format = "{ifname}";
+          format-wifi = "{essid} ({signalStrength}%) ";
+          format-ethernet = "{ifname} ";
+          format-disconnected = ""; # An empty format will hide the module.
+          tooltip-format = "{ifname}";
+          tooltip-format-wifi = "{essid} ({signalStrength}%) ";
+          tooltip-format-ethernet = "{ifname} ";
+          tooltip-format-disconnected = "Disconnected";
+          max-length = 50;
+        };
+
+        "keyboard-state#capslock" = {
+          capslock = true;
+          format = "{name} {icon}";
+          format-icons = {
+            locked = "";
+            unlocked = "";
+          };
+        };
+
+        "keyboard-state#numlock" = {
+          numlock = true;
+          format = "{name} {icon}";
+          format-icons = {
+            locked = "";
+            unlocked = "";
+          };
+        };
       };
     };
 
+    # https://catppuccin.com/palette
     style = ''
       * {
         border: none;
@@ -149,7 +178,6 @@
         border-radius: 10px;
       }
 
-      #language,
       #custom-updates,
       #custom-caffeine,
       #custom-weather,
@@ -159,6 +187,8 @@
       #pulseaudio,
       #network,
       #workspaces,
+      #keyboard-state.numlock,
+      #keyboard-state.capslock,
       #tray,
       #backlight {
         background: #1e1e2e;
@@ -188,12 +218,6 @@
         margin-left: 10px;
       }
 
-      #custom-language {
-        color: #f38ba8;
-        border-left: 0px;
-        border-right: 0px;
-      }
-
       #custom-updates {
         color: #f5c2e7;
         border-radius: 10px 0px 0px 10px;
@@ -208,30 +232,46 @@
       }
 
       #clock {
-        color: #fab387;
+        color: #f5a97f;
         border-radius: 10px 0px 0px 10px;
         margin-left: 5px;
         border-right: 0px;
       }
 
-      #network {
-        color: #f9e2af;
+      #keyboard-state.capslock {
+        color: #91d7e3;
+        border-left: 0px;
+        border-right: 0px;
+        border-radius: 10px 0px 0px 10px;
+      }
+
+      #keyboard-state.numlock {
+        color: #7dc4e4;
         border-left: 0px;
         border-right: 0px;
       }
 
+      #network {
+        color: #eed49f;
+        border-left: 0px;
+        border-right: 0px;
+        border-radius: 10px 10px 10px 10px;
+        margin-left: 5px;
+        padding-right: 15px;
+      }
+
       #pulseaudio {
-        color: #89b4fa;
+        color: #8aadf4;
         border-left: 0px;
         border-right: 0px;
       }
 
       #pulseaudio.microphone {
-        color: #cba6f7;
+        color: #c6a0f6;
         border-radius: 0px 10px 10px 0px;
         border-left: 0px;
         border-right: 0px;
-        margin-right: 5px;
+        padding-top: 5px;
       }
 
       #battery {