From 6f96122b83743da425809a6e376b904ef9ce9e8f Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Tue, 8 Jul 2025 09:37:00 -0500
Subject: [PATCH] switch to waybar

---
 home/home.nix             | 29 ++++++++++++++++++++---------
 home/modules/hyprland.nix |  8 ++++----
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index e8e16a5..e546fd4 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -666,15 +666,15 @@ in {
         height = 15;
         width = if laptop then 1400 else 3000;
         # Choose the order of the modules "custom/wintitle", 
-        modules-left = [ "hyprland/window" ];
-        modules-center = [ "hyprland/workspaces" ];
+        modules-left = [ "hyprland/workspaces" "hyprland/window" ];
+        modules-center = [ "clock" ];
         modules-right =
-          [ "pulseaudio" "backlight" "battery" "tray" "clock" ];
+          [ "cpu" "memory" "pulseaudio" "backlight" "battery" "tray" ];
         margin-top = if laptop then -5 else 5;
         margin-bottom = if laptop then 4 else 0;
         margin-left = 6;
         margin-right = 6;
-        "hyprland/window" = { format = "  <span style='italic'>{}</span>"; };
+        "hyprland/window" = { format = "<span style='italic'>{title}</span>"; icon = true; };
         workspaces = { format = " {name} "; };
         "hyprland/workspaces" = {
           format = "{icon}";
@@ -702,7 +702,7 @@ in {
             <big>{:%Y %B}</big>
             <tt><small>{calendar}</small></tt>'';
           format-alt = "{:%Y-%m-%d}";
-          format = "{:%a %b %e, %I:%M %p}";
+          format = "{:%b %e, %I:%M %p}";
         };
         cpu = { format = "  {usage}%"; on-click = "alacritty --class btop -e btop"; };
         memory = { format = "  {}%"; on-click = "alacritty --class btop -e btop"; };
@@ -723,7 +723,7 @@ in {
         };
         backlight = {
           # "device": "acpi_video1",
-          format = "{icon}  {PERCENT}%";
+          format = "{icon} {PERCENT}%";
           format-icons = [ "" "" ];
         };
         disk = {
@@ -820,6 +820,17 @@ in {
           padding-bottom: 2px;
           padding-left: 5px;
           padding-right: 5px;
+          margin-right: 50px;
+          background: @backtransparent;
+          box-shadow: 5px 5px 4px 4px #202020;
+          border-radius: 20px;
+     }
+
+     .modules-center {
+          padding-top: 2px;
+          padding-bottom: 2px;
+          padding-left: 5px;
+          padding-right: 2px;
           background: @backtransparent;
           box-shadow: 5px 5px 4px 4px #202020;
           border-radius: 20px;
@@ -940,7 +951,7 @@ in {
 
       #pulseaudio {
           padding-left: 5px;
-          padding-right: 5px;
+          padding-right: 0px;
           border-radius: 20px;
           transition: none;
           color: @base0A;
@@ -975,8 +986,8 @@ in {
       }
 
       #battery {
-          padding-left: 5px;
-          padding-right: 5px;
+          padding-left: 0px;
+          padding-right: 0px;
           border-radius: 20px;
           transition: none;
           color: @base0D;
diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix
index 6f719e4..1051aaf 100644
--- a/home/modules/hyprland.nix
+++ b/home/modules/hyprland.nix
@@ -345,7 +345,7 @@ in
         "SUPERALT,a,movetoworkspace,special:agenda"
         "SUPER,g,togglespecialworkspace,agenda"
 
-        # "SUPERSHIFT,g,exec,waybar.sh"
+        "SUPERSHIFT,w,exec,waybar.sh"
         "SUPERALT,n,exec,eww update rightside=true"
         "SUPERCTRL,f,exec,forms-fill.sh"
       ];
@@ -386,11 +386,11 @@ in
       
       exec-once = [
         "kwalletd6"
-        "eww daemon"
+        # "eww daemon"
         "hyprpaper"
-        "eww open ${if laptop then "bar0" else "bar1"}"
+        # "eww open ${if laptop then "bar0" else "bar1"}"
         # "dunst"
-        # "waybar"
+        "waybar.sh"
         "swww-daemon"
         "rbw-agent"
         "hyprctl dispatch --batch 'splitratio 1; splitration -0.35'"