Merge branch 'macbook-hyprland'

modules/desktop-environments/hyprland/config/waybar/default.nix

@@ -1,24 +1,33 @@
-{ pkgs, ... }:
+{ pkgs, hyprlandSettings, ... }:
 let
   settings = import ../../settings.nix { inherit pkgs; };
 
   defaultOpacity = "opacity: 0.85;";
   defaultBorderRadius = "border-radius: 1rem;";
   defaultCenterOptions = ''
-    padding: 0.5rem 1rem;
-    margin: 5px 0;
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+    margin: 3px 0;
   '';
   borderRight = ''
-    padding: 0.5rem 1rem;
-    margin: 5px 0;
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+    margin: 3px 0;
     border-radius: 0rem 1rem 1rem 0rem;
-    margin-right: 1rem;
+    margin-right: 0.5rem;
   '';
   borderLeft = ''
-    padding: 0.5rem 1rem;
-    margin: 5px 0;
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+    margin: 3px 0;
     border-radius: 1rem 0rem 0rem 1rem;
-    margin-left: 1rem;
+    margin-left: 0.5rem;
   '';
 in
 {
@@ -34,7 +43,7 @@ in
     systemd.enable = true;
     settings = {
       mainBar = {
-        layer = "bottom";
+        layer = "top";
         position = "top";
         mod = "dock";
         exclusive = true;
@@ -47,20 +56,22 @@ in
 
         modules-center = [ "hyprland/window" ];
 
-        modules-right = [
-          "tray"
-          "custom/lights"
-          "temperature"
-          "temperature#gpu"
-          "keyboard-state#capslock"
-          "keyboard-state#numlock"
-          "wireplumber#sink"
-          "wireplumber#source"
-          "bluetooth"
-          "idle_inhibitor"
-          "clock"
-          "custom/weather"
-        ];
+        # modules-right = [
+        #   "tray"
+        #   "custom/lights"
+        #   "temperature"
+        #   "temperature#gpu"
+        #   "keyboard-state#capslock"
+        #   "keyboard-state#numlock"
+        #   "wireplumber#sink"
+        #   "wireplumber#source"
+        #   "bluetooth"
+        #   "idle_inhibitor"
+        #   "clock"
+        #   "custom/weather"
+        # ];
+
+        modules-right = hyprlandSettings.waybar.modules-right;
 
         # Module Definitions
         # Left
@@ -203,6 +214,19 @@ in
           tooltip-format-connected = "{status}";
           tooltip-format-enumerate-connected = { };
         };
+        
+        network = {
+          interface = "wlan0";
+          format = "{ifname}";
+          format-wifi = ""; # "{essid} ({signalStrength}%) ";
+          format-ethernet = "󰊗"; # "{ipaddr}/{cidr} 󰊗";
+          format-disconnected = "" ; # An empty format will hide the module.
+          tooltip-format = "{ifname} via {gwaddr} 󰊗";
+          tooltip-format-wifi = "{essid} ({signalStrength}%) ";
+          tooltip-format-ethernet = "{ifname} ";
+          tooltip-format-disconnected = "Disconnected";
+          max-length = 50;
+        };
 
         idle_inhibitor = {
           format = "{icon}";
@@ -226,6 +250,18 @@ in
           };
         };
 
+        battery = {
+          # bat = "macsmc-ac";
+          interval = 60;
+          states = {
+              warning = 30;
+              critical = 15;
+          };
+          format = "{capacity}% {icon}";
+          format-icons = ["" "" "" "" ""];
+          max-length = 25;
+        };
+
         "custom/weather" = {
           tooltip = true;
           format = { };
@@ -301,8 +337,8 @@ in
         ${defaultOpacity}
         ${defaultBorderRadius}
         ${defaultCenterOptions}
-        margin-left: 6rem;
-        margin-right: 6rem;
+        margin-left: 4rem;
+        margin-right: 100rem;
       }
 
       #custom-weather { 
@@ -312,6 +348,14 @@ in
         ${borderRight}
       }
 
+      #battery {
+        color: ${settings.nord.aurora.nord15};
+        background-color: ${settings.nord.polarNight.nord0};
+        ${defaultOpacity}
+        ${defaultCenterOptions}
+        border-radius: 0;
+      }
+
       #clock {
         color: ${settings.nord.frost.nord9};
         background-color: ${settings.nord.polarNight.nord0};
@@ -328,6 +372,14 @@ in
         ${borderRight}
       }
 
+      #network {
+        color: ${settings.nord.aurora.nord15};
+        background-color: ${settings.nord.polarNight.nord0};
+        ${defaultOpacity}
+        ${borderRight}
+        padding-right: 15px;
+      }
+
       #bluetooth {
         color: ${settings.nord.frost.nord9};
         background-color: ${settings.nord.polarNight.nord0};
@@ -380,8 +432,7 @@ in
         color: ${settings.nord.frost.nord9};
         background-color: ${settings.nord.polarNight.nord0};
         ${defaultOpacity}
-        ${defaultCenterOptions}
-        border-radius: 0;
+        ${borderLeft}
       }
 
       #custom-lights {