From f673c4543e235c81a228262495daf8a615a657dc Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Fri, 12 Apr 2024 17:07:37 -0500
Subject: [PATCH 1/2] added volume bar to playerctl statuses.

---
 modules/both/i3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/both/i3/default.nix b/modules/both/i3/default.nix
index 52fc283..30cca2f 100644
--- a/modules/both/i3/default.nix
+++ b/modules/both/i3/default.nix
@@ -155,13 +155,13 @@
           '';
 
           "${mod}+mod1+p" = ''
-            exec --no-startup-id "playerctl play-pause"
+            exec --no-startup-id "playerctl play-pause; dunstify -h string:x-dunst-stack-tag:playerstatus --timeout=500 Player $(playerctl status)"
           '';
           "${mod}+mod1+plus" = ''
-            exec --no-startup-id "playerctl volume -- +0.1; dunstify -h string:x-dunst-stack-tag:playervol --timeout=500 Player $(playerctl volume)"
+            exec --no-startup-id "playerctl volume 0.01+; dunstify -h string:x-dunst-stack-tag:volume --timeout=500 -h int:value:$(playerctl volume | cut -d' ' -f2 | awk '{print $1*100}' ) Player"
           '';
           "${mod}+mod1+minus" = ''
-            exec --no-startup-id "playerctl volume -- -0.1; dunstify -h string:x-dunst-stack-tag:playervol --timeout=500 Player $(playerctl volume)"
+            exec --no-startup-id "playerctl volume 0.01-; dunstify -h string:x-dunst-stack-tag:volume --timeout=500 -h int:value:$(playerctl volume | cut -d' ' -f2 | awk '{print $1*100}' ) Player"
           '';
 
           #open volume control

From eae2664fd67a1e112f17532bee1f42c0fef0780e Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Fri, 12 Apr 2024 21:44:37 -0500
Subject: [PATCH 2/2] some ajustments to status bar.

---
 modules/both/i3/i3status-rust.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/both/i3/i3status-rust.nix b/modules/both/i3/i3status-rust.nix
index c903388..c354981 100644
--- a/modules/both/i3/i3status-rust.nix
+++ b/modules/both/i3/i3status-rust.nix
@@ -28,7 +28,7 @@
           blocks = [
             {
               block = "music";
-              format = "{$icon $combo.str(max_w:25,rot_interval:0.5) $play $prev $next $player.str(max_w:5,rot_interval:0.5) [$cur/$avail] |}";
+              format = "{$icon $combo.str(max_w:25,rot_interval:0.5) $play $prev $next $player.str(max_w:5,rot_interval:0.5) [$cur/$avail]|}";
             }
             {
               block = "memory";
@@ -54,7 +54,8 @@
               {
                 block = "battery";
                 driver = "upower";
-                format = "$icon $percentage {$time |}";
+                device = "DisplayDevice";
+                format = "$icon $percentage {$time|}";
               }
             )
             {
@@ -64,7 +65,7 @@
             }
             {
               block = "sound";
-              format = "$icon {$volume.bar(v:true) $volume.eng(w:2) |}";
+              format = "$icon {$volume.bar(v:true) $volume.eng(w:2)|}";
               headphones_indicator = true;
               click = [
                 {