From 666de44018f4e9dc4ed089ba35fbb00a50a1454f Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Thu, 28 Mar 2024 23:48:24 +0000
Subject: tweaks for osgiliath

---
 lib/Monitors.hs | 10 ++++++++++
 src/Single.hs   | 28 ++++++++++++++++++----------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/lib/Monitors.hs b/lib/Monitors.hs
index a1f1bb1..0b65af0 100644
--- a/lib/Monitors.hs
+++ b/lib/Monitors.hs
@@ -188,6 +188,16 @@ masterVol p =
 
 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10
 
+masterAlsa p =
+  Alsa "default" "Master"
+                  ["-t", "<status> <volume>"
+                  , "--", "-C", pForeground p, "-c", "#8b4726"
+                  , "-O", fn 1 "\xf025"
+                  , "-o", fn 1 "\xf131"
+                  ]
+
+captureAlsa = Alsa "default" "Capture" ["-t", "<volume>"]
+
 kbd p = Kbd [("us", ""), ("us(intl)", kbi pHigh)] -- kbi pDim
   where kbi a = fc (a p) (fn 1 " \xf11c")
 
diff --git a/src/Single.hs b/src/Single.hs
index 891380b..2119c6d 100644
--- a/src/Single.hs
+++ b/src/Single.hs
@@ -8,7 +8,12 @@ topProcL p s = TopProc (p <~> args) 15
                             ++ "·  <mboth1>  <mboth2>  <mboth3>  <mboth4>"
         args = ["-t", temp, "-w", "12", "-L" , "10", "-H", "80"]
 
-diskIOS p = DiskIO [("/", "<read> <write>")] (diskArgs p) 10
+diskIOS p = DiskIO [("/", "<total>"), ("/home", "<total>")] (diskArgs p) 10
+
+diskU' p =
+  DiskU [("/", "/ <free>"), ("/var", "/v <free>") ,("/home", "/h <free>")]
+        (p >~< ["-L", "20", "-H", "70", "-m", "1", "-p", "3"])
+        20
 
 cpuFreq' p = CpuFreq (p <~> args) 50
   where args = ["-t" , "<avg>" , "-L", "1", "-H", "2", "-d", "2"]
@@ -32,18 +37,20 @@ config p = (baseConfig p) {
   , commands = [ Run (topProcL p isXmonad)
                , Run (load p)
                , Run (iconBatt p)
-               , Run (cpuBars p)
+--               , Run (cpuBars p)
                , Run memory'
-               , Run (diskU p)
+               , Run (diskU' p)
                , Run (diskIOS p)
                , Run (kbd p)
                , Run (coreTemp p)
                , Run (wireless p "wlan0")
                , Run (dynNetwork p)
-               , Run (vpnMark "wg-mullvad")
-               , Run tun0
-               , Run (masterVol p)
-               , Run captureVol
+--               , Run (vpnMark "wg-mullvad")
+--               , Run tun0
+--               , Run (masterVol p)
+--               , Run captureVol
+               , Run (masterAlsa p)
+               , Run captureAlsa
                , Run laTime
                , Run localTime
                , Run (cpuFreq' p)
@@ -52,11 +59,12 @@ config p = (baseConfig p) {
   , template = trayT
              ++ " |batt0| "
              ++ "<action=`toggle-app.sh nm-applet`>"
-             ++ "  <fc=#000000>|wg-mullvad||tun0||wlan0wi|</fc>"
+             ++ "  <fc=#000000>|wlan0wi|</fc>"
              ++ "</action>"
              ++ " |dynnetwork| "
              ++ "<action=`toggle-app.sh pasystray`>"
-             ++ "  |default:Master| " ++ dimi "\xf130" ++ " |default:Capture|"
+--             ++ "  |default:Master| " ++ dimi "\xf130" ++ " |default:Capture|"
+             ++ "  |alsa:default:Master| " ++ dimi "\xf130" ++ " |alsa:default:Capture|"
              ++ "</action>"
              ++ "    |EGPH|"
              ++ mail
@@ -64,7 +72,7 @@ config p = (baseConfig p) {
              ++ eLog p
              ++ "{"
              ++ "}"
-             -- ++ "|multicpu|"
+--             ++ "|multicpu|"
              ++ "  |cpufreq|"
              ++ " |multicoretemp|"
              ++ "  |top|   "
-- 
cgit v1.2.3