2 files changed, 26 insertions, 21 deletions

diff --git a/users/sils/hyprland/default.nix b/users/sils/hyprland/default.nix
index 47e5eae..ed87a0b 100644
--- a/users/sils/hyprland/default.nix
+++ b/users/sils/hyprland/default.nix
@@ -178,8 +178,8 @@
       #exec-once=bash ~/.config/hypr/start.sh
       #exec-once=swww init &
       exec-once = [
-        "${pkgs.nwg-panel}/bin/nwg-panel"
-        "nm-applet --indicator"
+        #"${pkgs.nwg-panel}/bin/nwg-panel"
+        #"nm-applet --indicator"
         #"${pkgs.waybar}/bin/waybar"
         "${pkgs.mako}/bin/mako"
         "${pkgs.swaybg}/bin/swaybg -i ~/repos/nix-config/files/wallpaper.jpg"
diff --git a/users/sils/waybar/default.nix b/users/sils/waybar/default.nix
index 743eec9..29cf933 100644
--- a/users/sils/waybar/default.nix
+++ b/users/sils/waybar/default.nix
@@ -1,19 +1,27 @@
 {pkgs, ...}: {
   programs.waybar = {
-    enable = false;
+    enable = true;
     settings = {
       mainBar = {
         layer = "top";
         position = "top";
-        modules-left = ["wlr/workspaces"];
-        modules-center = [];
-        modules-right = ["pulseaudio" "network" "backlight" "battery" "clock" "tray" "custom/power"];
+        modules-left = ["hyprland/workspaces" "clock"];
+        modules-center = ["hyprland/window"];
+        modules-right = ["pulseaudio" "network" "backlight" "battery" "tray"];
 
-        "wlr/workspaces" = {
-          disable-scroll = true;
+        "hyprland/workspaces" = {
+          disable-scroll = false;
           sort-by-name = true;
-          format = "{icon}";
-          format-icons = {default = "";};
+          format = "{name}";
+          #format-icons = {default = "";};
+          on-sroll-up = "hyprctl dispatch workspace e+1";
+          on-scroll-down = "hyprctl dispatch workspace e-1";
+          on-click = "activate";
+        };
+
+        "hyprland/window" = {
+          max-length = 200;
+          separate-outputs = true;
         };
 
         pulseaudio = {
@@ -45,7 +53,7 @@
             warning = 30;
             critical = 15;
           };
-          format = "{icon}";
+          format = "{capacity}% {icon}";
           format-charging = "";
           format-plugged = "";
           format-icons = ["" "" "" "" "" "" "" "" "" "" "" ""];
@@ -53,23 +61,20 @@
           tooltip-format = "{capacity}%";
         };
 
-        "custom/power" = {
-          tooltip = false;
-          on-click = "powermenu";
-          format = "襤";
-        };
+       # "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}'';
+             {:%d %m %Y}'';
           format = ''
-            {:%H
-            %M}'';
+            {:%H %M}'';
         };
 
         tray = {