1 files changed, 75 insertions, 36 deletions

diff --git a/users/sils/waybar/default.nix b/users/sils/waybar/default.nix
index cafe20a..29f1ca5 100644
--- a/users/sils/waybar/default.nix
+++ b/users/sils/waybar/default.nix
@@ -1,45 +1,84 @@
 {pkgs, ...}: {
   programs.waybar = {
     enable = true;
-    package = pkgs.waybar;
-    settings = [
-      {
-        mainBar = {
-          layer = "top";
-          position = "top";
-          output = [
-            "eDP-1"
-            "DP-2"
-          ];
-        };
-        modules-left = [
-          "wlr/workspaces"
-          "hyprland/submap"
-          "wlr/taskbar"
-        ];
-        modules-center = [
-          "hyprland/window"
-        ];
-        modules-right = [
-          "idle_inhibitor"
-          "memory"
-          "cpu"
-          "battery"
-          "clock"
-        ];
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        modules-left = ["wlr/workspaces"];
+        modules-center = [];
+        modules-right = ["pulseaudio" "network" "backlight" "battery" "clock" "tray" "custom/power"];
+
         "wlr/workspaces" = {
-          "format" = "{icon}";
-          "on-scroll-up" = "${pkgs.hyprland}/bin/hyprctl dispatch workspace e+1";
-          "on-scroll-down" = "${pkgs.hyprland}/bin/hyprctl dispatch workspace e-1";
-          "on-click" = "activate";
+          disable-scroll = true;
+          sort-by-name = true;
+          format = "{icon}";
+          format-icons = {default = "";};
+        };
+
+        pulseaudio = {
+          format = " {icon} ";
+          format-muted = "ﱝ";
+          format-icons = ["奄" "奔" "墳"];
+          tooltip = true;
+          tooltip-format = "{volume}%";
+        };
+
+        network = {
+          format-wifi = " ";
+          format-disconnected = "睊";
+          format-ethernet = " ";
+          tooltip = true;
+          tooltip-format = "{signalStrength}%";
+        };
+
+        backlight = {
+          device = "intel_backlight";
+          format = "{icon}";
+          format-icons = ["" "" "" "" "" "" "" "" ""];
+          tooltip = true;
+          tooltip-format = "{percent}%";
         };
-        "clock" = {
-          "timezone" = "Europe/Berlin";
-          "tooltip-format" = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
-          "format-alt" = "{:%Y-%m-%d}";
+
+        battery = {
+          states = {
+            warning = 30;
+            critical = 15;
+          };
+          format = "{icon}";
+          format-charging = "";
+          format-plugged = "";
+          format-icons = ["" "" "" "" "" "" "" "" "" "" "" ""];
+          tooltip = true;
+          tooltip-format = "{capacity}%";
         };
-      }
-    ];
+
+        "custom/power" = {
+          tooltip = false;
+          on-click = "powermenu";
+          format = "襤";
+        };
+
+        clock = {
+          tooltip-format = ''
+            <big>{:%Y %B}</big>
+            <tt><small>{calendar}</small></tt>'';
+          format-alt = ''
+             {:%d
+             %m
+            %Y}'';
+          format = ''
+            {:%H
+            %M}'';
+        };
+
+        tray = {
+          icon-size = 21;
+          spacing = 10;
+        };
+      };
+    };
+
     style = ./style.css;
     systemd = {
       enable = true;