From 2d3624e29054aceaa9dc74410606de5745f5feb2 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Fri, 26 Apr 2024 15:47:38 +0200
Subject: [PATCH] waybar tweeks ++

---
 home-modules/hyprland.nix | 10 +++++-----
 home-modules/waybar.nix   | 16 ++++++++++------
 home.nix                  |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix
index 90ea492..856cf71 100644
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -440,12 +440,12 @@ in
 
         ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
         ",XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-"
-        ",XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle"
+        ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
         ",XF86AudioPlay, exec, playerctl play-pause"
-        ",XF86AudioPrev, exec, playerctl playerctl previous"
-        ",XF86AudioNext, exec, playerctl playerctl next"
-        ",XF86MonBrightnessUp, exec, brightnessctl s  '5%+'"
-        ",XF86MonBrightnessDown, exec, brightnessctl s  '5%-'"
+        ",XF86AudioPrev, exec, playerctl previous"
+        ",XF86AudioNext, exec, playerctl next"
+        ",XF86MonBrightnessUp, exec, brightnessctl s '5%+'"
+        ",XF86MonBrightnessDown, exec, brightnessctl s '5%-'"
 
         ###########################################################################
         ## MOUSE:
diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix
index 2ea1873..32be260 100644
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -47,7 +47,7 @@ in
       #ord=$(date +"%e" | awk '{printf("%d%s\n", $1, substr("thstndrd", ($1%100-20)%10*2+1, 2))}')
       ord=$(date +"%e" | awk '{printf("%d%s\n", $1, ($1==11||$1==12||$1==13)?"th":((($1%10)==1)?"st":((($1%10)==2)?"nd":((($1%10)==3)?"rd":"th"))))}')
       if [ $# -eq 0 ]; then
-        echo "󰃮${sep}$(date +'%A the')" "$ord" "of" "$(date +'%B')" " ${sep}" "$(date +'%R')"
+        echo "󰃮${sep}$(date +'%A the')" "$ord" "of" "$(date +'%B')" " ${sep}$(date +'%R')"
       elif [ "$1" = "--no-icons" ]; then
         echo "$(date +'%A the')" "$ord" "of" "$(date +'%B')"  "$(date +'%R')"
       fi
@@ -59,7 +59,7 @@ in
     enable = true;
     settings = {
       bar = {
-        height = 30;
+        height = 20;
         layer = "top";
         # position = "top";
         position = "bottom";
@@ -93,7 +93,7 @@ in
           active-only = false;
         };
         "hyprland/window" = {
-          format = "{}";
+          format = "${sep}{}";
           separate-outputs = true;
         };
         "custom/cclock" = {
@@ -160,7 +160,7 @@ in
         };
         wireplumber = {
           format = "󰕾${sep}{volume}%";
-          format-muted = "󰝟${sep}Muted";
+          format-muted = "󰝟${sep}--%";
         };
       };
     };
@@ -228,8 +228,12 @@ in
         color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red});
       }
 
-      #window {
-        font-family: ${rice.font.base.name};
+      #window, #custom-ctimeremaining {
+        font-family: ${rice.font.base.name}, ${rice.font.code.name2};
+        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue});
+      }
+
+      #wireplumber.muted {
         color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue});
       }
     '';
diff --git a/home.nix b/home.nix
index b1d3ec7..19d47b9 100644
--- a/home.nix
+++ b/home.nix
@@ -57,7 +57,7 @@
     spotify spicetify-cli
     obs-studio
     
-    waybar swww rofi 
+    waybar swww rofi playerctl
     
     imv mpv mediainfo exiftool ffmpeg
     pavucontrol fontpreview gtk2fontsel