Waybar config WIP

2 files changed, 56 insertions, 46 deletions

diff --git a/share/cfg/waybar.css b/share/cfg/waybar.css
index c2213cb..9cc27fd 100644
--- a/share/cfg/waybar.css
+++ b/share/cfg/waybar.css
@@ -104,8 +104,8 @@ button:hover {
 
 @keyframes blink {
     to {
-        background-color: #ffffff;
-        color: #000000;
+    background-color: #ffffff;
+    color: #000000;
     }
 }
 
@@ -246,7 +246,7 @@ label:focus {
 }
 
 #scratchpad.empty {
-	background-color: transparent;
+    background-color: transparent;
 }
 
 #privacy {
diff --git a/share/cfg/waybar.nix b/share/cfg/waybar.nix
index 9df08b2..1392308 100644
--- a/share/cfg/waybar.nix
+++ b/share/cfg/waybar.nix
@@ -1,50 +1,60 @@
-{ ... }: {
+{ lib, ... }:
+{
   programs.waybar = {
     systemd = {
       enable = true;
       target = "hyprland-session.target";
     };
-    #    settings.mainBar = {
-    #      layer = "top";
-    #      position = "right";
-    #      width = 40;
-    #      reload_style_on_change = true;
-    #
-    #      modules-left = [ "hyprland/workspaces" ];
-    #      modules-right = [
-    #        "battery"
-    #        "network"
-    #        "cpu"
-    #        "memory"
-    #        "temperature"
-    #        "backlight"
-    #        "clock"
-    #        "tray"
-    #      ];
-    #
-    #      clock = {
-    #        format = "{:%H:%m\n%b}";
-    #      };
-    #
-    #      battery = {
-    #        format = lib.concatStringsSep "\n" [
-    #          "{icon} {capacity}%"
-    #          "󱐋 {power:4.1f} W"
-    #        ];
-    #        interval = 2;
-    #        format-icons = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
-    #      };
-    #
-    #      keyboard-state = {
-    #        numlock = true;
-    #        capslock = true;
-    #        format = "{name} {icon}";
-    #        format-icons = {
-    #          locked = "";
-    #          unlocked = "";
-    #        };
-    #      };
-    #    }; # end of settings.mainBar
-    #    style = builtins.readFile ./waybar.css;
+    settings.mainBar = {
+      layer = "top";
+      position = "right";
+      # width = 40;
+      reload_style_on_change = true;
+
+      modules-left = [ "hyprland/workspaces" ];
+      modules-right = [
+        "battery#capacity"
+        "battery#power"
+        "network"
+        "cpu"
+        "memory"
+        "temperature"
+        "backlight"
+        "clock"
+        "tray"
+      ];
+
+      # TODO: fix clock format
+      clock = {
+        format = "{:%H:%m}";
+      };
+
+      "battery#capacity" = {
+        format = lib.concatStringsSep "\n" [ "{icon}" "{capacity}%" ];
+        format-icons = [ "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
+      };
+
+      "battery#power" = {
+        format = lib.concatStringsSep "\n" [ "󱐋" "{power:4.1f}W" ];
+        interval = 1;
+      };
+
+      # TODO: human readable bandwidth formatting
+      # See: https://github.com/Alexays/Waybar/issues/2162
+      # network = {
+      #   format-ethernet = lib.concatStringsSep "\n" ["Eth" ""];
+      # };
+
+      keyboard-state = {
+        numlock = true;
+        capslock = true;
+        format = "{name} {icon}";
+        format-icons = {
+          locked = "";
+          unlocked = "";
+        };
+      };
+    }; # end of settings.mainBar
+    style = builtins.readFile ./waybar.css;
   };
 }