From a249429cb15c3aacdf1d44e68cd9dbb75b6d7fbf Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Fri, 4 Aug 2023 02:50:45 +0100
Subject: nits and test target

---
 src/Single.hs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/Single.hs')

diff --git a/src/Single.hs b/src/Single.hs
index e7ecee6..166ceec 100644
--- a/src/Single.hs
+++ b/src/Single.hs
@@ -25,9 +25,10 @@ config p = (baseConfig p) {
   , textOffsets = []
   , textOffset = 0
   , iconOffset = 0
-  -- , font = "Source Code Pro, Noto Color Emoji Regular 9, Italic 9"
-  -- , font = "DejaVu Sans Mono, Noto Color Emoji 9, Regular 9"
-  , font = "Hack, Noto Color Emoji Regular 9, Light 9"
+  , dpi = 0
+  -- , font = "Source Code Pro, Noto Color Emoji Regular 9, Regular 9"
+  , font = "DejaVu Sans Mono, Noto Color Emoji 9, Regular 9"
+  -- , font = "Hack, Noto Color Emoji Regular 9, Light 9"
   , commands = [ Run (topProcL p isXmonad)
                , Run (load p)
                , Run (iconBatt p)
@@ -37,7 +38,7 @@ config p = (baseConfig p) {
                , Run (diskIOS p)
                , Run (kbd p)
                , Run (coreTemp p)
-               , Run (wireless p "wlp164s0")
+               , Run (wireless p "wlan0")
                , Run (dynNetwork p)
                , Run (vpnMark "wg-mullvad")
                , Run tun0
@@ -47,24 +48,23 @@ config p = (baseConfig p) {
                , Run localTime
                , Run (cpuFreq' p)
                , Run (weather "EGPH" p)
-               -- , Run nmmail
                ] ++ extraCmds
   , template = trayT
              ++ " |batt0| "
              ++ "<action=`toggle-app.sh nm-applet`>"
-             ++ "  <fc=#000000>|wg-mullvad||tun0||wlp164s0wi|</fc>"
+             ++ "  <fc=#000000>|wg-mullvad||tun0||wlan0wi|</fc>"
              ++ "</action>"
              ++ " |dynnetwork| "
              ++ "<action=`toggle-app.sh pasystray`>"
              ++ "  |default:Master| " ++ dimi "\xf130" ++ " |default:Capture|"
              ++ "</action>"
              ++ "    |EGPH|"
-             -- ++ fc "sienna4" " |mail|"
+             ++ mail
              ++ " |kbd|"
-             ++ "{"
              ++ eLog p
+             ++ "{"
              ++ "}"
-             ++ " |multicpu|"
+             ++ "|multicpu|"
              ++ "  |cpufreq|"
              ++ " |multicoretemp|"
              ++ "  |top|   "
@@ -76,9 +76,12 @@ config p = (baseConfig p) {
           isXmonad = pWm p == Just "xmonad"
           trayT = if isXmonad then "|tray|" else ""
           eLog p = if isXmonad then "|XMonadLog|" else fc (pHigh p) "|elog|"
+          mail = if isXmonad then fc "sienna4" " |mail|" else ""
           extraCmds = if isXmonad
                       then [ Run (NamedXPropertyLog "_XMONAD_TRAYPAD" "tray")
-                           , Run XMonadLog]
+                           , Run XMonadLog
+                           , Run nmmail
+                           ]
                       else [Run (NamedXPropertyLog "_EMACS_LOG" "elog")]
 
 main :: IO ()
-- 
cgit v1.2.3