From: rush <rush@Thonkbook.com>
Date: Mon, 1 Sep 2025 02:37:21 +0000 (-0400)
Subject: Change to module for volume in modeline
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=f6217d620c31544ffb1679230278192529aa4508;p=stumpwminit.git

Change to module for volume in modeline
---

diff --git a/init.lisp b/init.lisp
index aded9d9..3eaa7c6 100644
--- a/init.lisp
+++ b/init.lisp
@@ -17,6 +17,9 @@
 
 (define-key *top-map* (kbd "s-l") "exec xscreensaver-command --activate")
 (define-key *top-map* (kbd "s-s") "toggle-slynk")
+(define-key *top-map* (kbd "XF86AudioRaiseVolume") "wpctl-volume-up")
+(define-key *top-map* (kbd "XF86AudioLowerVolume") "wpctl-volume-down")
+(define-key *top-map* (kbd "XF86AudioMute") "wpctl-toggle-mute")
 
 (define-key *root-map* (kbd "\-") "vsplit")
 (define-key *root-map* (kbd "\\") "hsplit")
@@ -55,6 +58,7 @@
 (load-module "beckon")
 (load-module "end-session")
 (load-module "pass")
+(load-module "wpctl")
 
 ;; MODE LINE
 (setf *mode-line-timeout* 2
@@ -79,18 +83,14 @@
 	"^Rnil^r"
 	(normalize-string output))))
 
-;; Get the volume
-(defun show-volume ()
-  "show current volume given a (type) argument"
-  (format nil "~,1f%" (* 100 (read-from-string (run-shell-command-and-format "wpctl get-volume @DEFAULT_AUDIO_SINK@ |sed -e 's/Volume//' -e 's/ 0\./ /' -e 's/\.00//'")))))
+(setf wpctl:*modeline-fmt* "%v")
 
-(setf *screen-mode-line-format* (list "^6[%g]^n "
-				      "%W"
+(setf *screen-mode-line-format* (list "%W"
 				      "^>"
 				      "%S"
 				      "Juice: %B"
 				      " | "
-				      '(:eval (show-volume))
+				      "Vol: %P"
 				      " | "
 				      "%d"))