Adjustments for thinkpad

3 files changed, 31 insertions, 22 deletions

diff --git a/src/TopC.hs b/src/TopC.hs
index 28461e5..fa75f75 100644
--- a/src/TopC.hs
+++ b/src/TopC.hs
@@ -8,18 +8,19 @@ config p = (baseConfig p) {
   , textOffset = defaultHeight - 8
   , textOffsets = [defaultHeight - 9, defaultHeight - 9,
                    defaultHeight - 6, defaultHeight - 8]
+  , iconOffset = 10
   , border = BottomB
   , alpha = 255
   , commands = [ Run (topProc' p)
-               , Run (multiCPU p)
+               , Run (cpuBars p)
                , Run memory
                , Run (diskU p)
                , Run (diskIO p)
-               , Run (coreTemp p)
-               , Run brightness
+               -- , Run (coreTemp p)
+               , Run brightness'
                , Run kbd
                , Run (batt p)
-               , Run (wireless p)
+               , Run (wireless p "wlp1s0")
                , Run (dynNetwork p)
                , Run tun0
                , Run (weather "EGPH") -- LEGE, LEBL, KCV0
@@ -30,13 +31,13 @@ config p = (baseConfig p) {
                , Run localTime
                ]
   , template = " |batt0| |bright|\
-               \ <action=`toggle-app.sh nm-applet`>|tun0||wlp2s0wi|</action> \
+               \ <action=`toggle-app.sh nm-applet`>|tun0||wlp1s0wi|</action> \
                \ |dynnetwork| \
-               \ <action=`toggle-app.sh blueman-tray`><fn=1>🎧</fn></action>\
+               \ <action=`toggle-app.sh blueman-tray`></action>\
                \<action=`toggle-app.sh pasystray`>|default:Master|\
                \ |default:Capture|</action>  |EGPH|\
                \ |mail| <fn=1>|kbd|</fn>{} \
-               \  |top| |multicpu|  |multicoretemp|\
+               \  |top| |multicpu|\
                \   |diskio| |disku| |memory| \
                \ <fn=2>🕓  </fn>|datetime| |laTime| "
 }
diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs
index a4e907e..3cc4d85 100644
--- a/src/lib/Bottom.hs
+++ b/src/lib/Bottom.hs
@@ -13,15 +13,15 @@ config cs tpl p = (baseConfig p) {
                    defaultHeight - 7]
   , border = TopB
   , template = "|tray| \
-               \<action=`toggle-app.sh nm-applet`>|tun0||wlp2s0wi|</action> \
+               \<action=`toggle-app.sh nm-applet`>|tun0||wlp1s0wi|</action> \
                \ |dynnetwork| \
-               \ <action=`toggle-app.sh pasystray`><fn=1>🎧</fn>|default:Master|\
+               \ <action=`toggle-app.sh pasystray`>|default:Master|\
                \ |default:Capture|</action>  <fn=2>🎵</fn>"
              ++ tpl
              ++ " {} |mail|  |EGPH| \
                 \ <fn=2>🗓  </fn>|uptime| <fn=2>🕓 </fn>|datetime| |laTime| "
   , commands = [ Run (uptime p)
-               , Run (wireless p)
+               , Run (wireless p "wlp1s0")
                , Run (dynNetwork p)
                , Run tun0
                , Run (weather "EGPH") -- LEGE, LEBL, KCV0
diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs
index 1d47c5f..5639185 100644
--- a/src/lib/Monitors.hs
+++ b/src/lib/Monitors.hs
@@ -44,9 +44,9 @@ topProc' p = TopProc (p <~> ["-t" , "<mboth1>  <mboth2>  <mboth3> \
                                    \· <both1>  <both2>  <both3>"
                            , "-w", "10", "-L" , "10", "-H", "80"]) 15
 
-wireless p = Wireless "wlp2s0" (p <~> ["-t" , "<essid> <quality>"
-                                      , "-W", "5", "-M", "15" , "-m", "3"
-                                      , "-L", "20", "-H", "80"]) 20
+wireless p n = Wireless n (p <~> ["-t" , "<essid> <quality>"
+                                 , "-W", "5", "-M", "15" , "-m", "3"
+                                 , "-L", "20", "-H", "80"]) 20
 
 multiCPU p = MultiCpu (p <~> ["-t", "<autototal>"
                              , "-S", "on", "-b", " ", "-f", "*"
@@ -107,22 +107,28 @@ batt p =
            , "-H", "16", "-L", "10"
            , "-h", "sienna4", "-l", "gray20"] 50 "batt0"
 
-coreTemp p =
+avgCoretemp p =
   MultiCoreTemp (p <~> ["-t", "<avg>°"
                        , "-L", "50", "-H", "75", "-d", "0"]) 50
 
+coreTemp p =
+  MultiCoreTemp (p <~> ["-t", "<max>°"
+                       , "-L", "50", "-H", "75", "-d", "0"]) 50
+
 diskU p =
-  DiskU [("dm-1", "<used>") , ("/media/sdb", " s <used>")]
+  DiskU [("nvme0n1p2", "<used>") , ("/media/sdb", " s <used>")]
         (p <~> ["-L", "20", "-H", "70", "-m", "1", "-p", "3"])
         20
 
 diskIO p =
-  DiskIO [("dm-1"
+  DiskIO [("nvme0n1p2"
 --          , "<fn=1>⎗</fn> <readb> <fn=1>⎘</fn> <writeb> <fn=1><totalbbar></fn>")
-          , "<readb> <writeb> <fn=0><totalbbar></fn>")
+          , "<readb> <writeb> <fn=0><totalbipat></fn>")
          ]
-         (p <~> ["-f", "░", "-b", " ", "-L", "200000", "-H" , "10000000"
-                , "-W", "5", "-w", "5", "-p", "3"])
+        (mkArgs p
+                ["-f", "░", "-b", " ", "-L", "200000", "-H" , "10000000"
+                , "-W", "5", "-w", "5", "-p", "3"]
+                ["--total-icon-pattern", "<icon=load_%%.xpm/>"])
          10
 
 -- <fn=1>📨 🖅 🖃 📩 ✉ </fn>
@@ -155,16 +161,18 @@ mail = Mail [ ("I", "~/var/maildir/jao/inbox")
 masterVol =
   Volume "default" "Master"
                   ["-t", "<status> <volume>"
-                  , "--", "-C", "black", "-c", "sienna4", "-O", ""
-                  , "-o", " <fn=4>🔇</fn>"] 10
+                  , "--", "-C", "black", "-c", "sienna4"
+                  , "-O", "<fn=1>🎧</fn>"
+                  , "-o", "<fn=4>🔇</fn>"] 10
 
 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10
 
 kbd = Kbd [("us", ""), ("us(intl)", "   ⃣")]
 
 brightness = Brightness ["--", "-D", "intel_backlight"] 10
+brightness' = Brightness ["--", "-D", "amdgpu_bl0", "-C", "brightness"] 10
 
-memory = Memory ["-t","<available> M", "-p", "2"] 20
+memory = Memory ["-t","<available> M", "-p", "2", "w", "7"] 20
 
 tun0 = Network "tun0" ["-t", "<dev>:", "-x", ""] 20