diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/TopC.hs | 23 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 36 |
2 files changed, 34 insertions, 25 deletions
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| " diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index 9eb0447..7d8ef7e 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -154,6 +154,10 @@ iconBatt p = , "-H", "10", "-L", "7" , "-h", pHigh p, "-l", pLow p] 50 "batt0" +rizenTemp p = + K10Temp "0000:00:18.3" + (mkArgs p ["-t", "<Tctl>°C", "-L", "40", "-H", "70", "-d", "0"] []) 50 + thinkTemp p = MultiCoreTemp (mkArgs p ["-t", "<core1>°C", "-L", "40", "-H", "70", "-d", "0"] @@ -164,11 +168,11 @@ avgCoretemp p = , "-L", "50", "-H", "75", "-d", "0"]) 50 coreTemp p = - MultiCoreTemp (p <~> ["-t", "<max>°" + MultiCoreTemp (p <~> ["-t", "<avg>° <max>°" , "-L", "50", "-H", "75", "-d", "0"]) 50 diskU p = - DiskU [("/home", "<used>") , ("/media/sdb", " s <used>")] + DiskU [("/", "<used>") , ("/media/sda", " s <used>")] (p <~> ["-L", "20", "-H", "70", "-m", "1", "-p", "3"]) 20 @@ -178,24 +182,22 @@ diskArgs p = mkArgs p ["--total-icon-pattern", "<icon=load_%%.xpm/>", "-c"] diskIO p = - DiskIO [("nvme0n1p2" --- , "<fn=1>⎗</fn> <readb> <fn=1>⎘</fn> <writeb> <fn=1><totalbbar></fn>") - , "<readb> <writeb> <totalbipat>") - ] (diskArgs p) 10 + DiskIO [("rivendell-vg/root", "<readb> <writeb> <totalbipat>")] (diskArgs p) 10 -- <fn=1>📨 🖅 🖃 📩 ✉ </fn> -- (fni "\xf01c \xf03a \xf1fa \xf0e0 \xf1d8 ") mail p = MailX [ ("I", "jao/inbox", pHigh p) - , ("h", "jao/hacking", "") - , ("d", "jao/drivel", "") - , ("e", "jao/emacs", pDim p) - , ("g", "jao/gnu", pDim p) - , ("l", "jao/lists", pDim p) - , ("L", "jao/lobsters", pDim p) - , ("b", "jao/bills", pDim p) - , ("B", "bigml/inbox", pHigh p) + , ("b", "bigml/bugs", pHigh p) + , ("B", "bigml/inbox", "") , ("S", "bigml/support", "") - , ("L", "bigml/lists", "") + , ("H", "jao/hacking", "") + , ("D", "jao/drivel", "") + , ("D", "bigml/drivel", pDim p) + , ("R", "feeds/rss", pDim p) + , ("E", "feeds/emacs", pDim p) + , ("P", "feeds/prog", pDim p) + , ("B", "jao/bills", pDim p) + , ("L", "bigml/lists", pDim p) ] [ "-d", "~/var/mail" -- , "-p", fc (pHigh p) $ fn 1 "⎘ " -- fc (pLow p) (fni "\xf01c" ++ " ") @@ -226,7 +228,9 @@ memory = Memory ["-t","<available> M", "-p", "2", "-W", "7"] 20 netdev name icon = Network name ["-t", "<up>", "-x", "", "--", "--up", icon] 20 -- fn 2 "🔐 " -proton0 = netdev "proton0" $ fn 2 "🔒 " -- fni "\xf0e8 " +vpnMark n = netdev n $ fn 2 "🔒 " -- fni "\xf0e8 " +proton0 = vpnMark "proton0" +tun0 = vpnMark "tun0" laTime = DateZone "%H" "en_US" "US/Pacific" "laTime" 10 localTime = Date "%a %d %R" "datetime" 10 |