From a0a59cd24021e88e70a1a1052cd2a919660a6fa8 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 22 Jan 2022 17:43:55 +0000
Subject: nits and tray

---
 src/TopC.hs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/TopC.hs')

diff --git a/src/TopC.hs b/src/TopC.hs
index 0a6d88f..a85bb8c 100644
--- a/src/TopC.hs
+++ b/src/TopC.hs
@@ -32,38 +32,43 @@ config p = (baseConfig p) {
                    defaultHeight - 8, defaultHeight - 8]
   , border = FullB
   , commands = [ Run (topProcL p)
+               , Run (iconBatt p)
                , Run mpdMon
-               , Run mopMon
-               , Run (thinkTemp p)
                , Run (NamedXPropertyLog "_EMACS_LOG" "elog")
                , if pIsLight p then Run (cpu p) else  Run (cpuBars p)
                , Run memoratio
                , Run (diskU p)
                , Run (diskIOS p)
-               , Run brightness'
+               , Run brightness
                , Run (kbd p)
-               , Run (iconBatt p)
-               , Run (wireless p "wlp1s0")
+               , Run (coreTemp p)
+               , Run (wireless p "wlp164s0")
                , Run (dynNetwork p)
-               , Run proton0
+               , Run (vpnMark "wg-mullvad")
+               , Run tun0
                , Run (masterVol p)
                , Run captureVol
                , Run laTime
                , Run localTime
                , Run w -- LEGE, LEBL, KCV0
+               , Run trayPadding
                ]
-  , template = " "
+  , template = "|tray| "
              ++ "|batt0| "
              ++ dimi "\xf26c" ++ " |bright| "
-             ++ "<action=`toggle-app.sh nm-applet`> |proton0||wlp1s0wi|</action>"
+             ++ "<action=`toggle-app.sh nm-applet`>"
+             ++ " |wg-mullvad||tun0||wlp164s0wi|"
+             ++ "</action>"
              ++ " |dynnetwork| "
              ++ "<action=`toggle-app.sh pasystray`>"
              ++ "  |default:Master| " ++ dimi "\xf130" ++ " |default:Capture|"
              ++ "</action>  "
-             ++  "|mpd| |mopidy|"
+             ++  "|mpd|"
+--             ++  " |mopidy|"
              ++ " |EGPH| "
              ++ fc (pHigh p) "|elog|"
              ++ " {} "
+--             ++ "|mail|"
              ++ "|kbd| "
              ++ "|multicpu| "
              ++ "|multicoretemp| "
-- 
cgit v1.2.3