diff options
Diffstat (limited to 'src/Single.hs')
| -rw-r--r-- | src/Single.hs | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/src/Single.hs b/src/Single.hs index 891380b..707cc15 100644 --- a/src/Single.hs +++ b/src/Single.hs @@ -1,6 +1,7 @@ import Xmobar import Config import Monitors +import Music (mpdMon) topProcL p s = TopProc (p <~> args) 15 where temp | s = "<both1> <both2> <both3> · <mboth1> <mboth2> <mboth3>" @@ -8,7 +9,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"] @@ -22,56 +28,62 @@ config p = (baseConfig p) { , bgColor = if pIsLight p then "#f0f0f0" else "black" , alpha = 233 , border = FullB - , textOffsets = [] , textOffset = 0 , iconOffset = 0 , 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" + -- , 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) - , 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 laTime +-- , Run (vpnMark "wg-mullvad") +-- , Run tun0 +-- , Run (masterVol p) +-- , Run captureVol + , Run (masterAlsa p) + , Run captureAlsa +-- , Run laTime , Run localTime , Run (cpuFreq' p) , Run (weather "EGPH" p) + , Run mpdMon +-- , edinWeather ] ++ extraCmds , 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|" + ++ " |mpd|" +-- ++ " |wttr|" ++ mail ++ " |kbd| " ++ eLog p ++ "{" ++ "}" - -- ++ "|multicpu|" +-- ++ "|multicpu|" ++ " |cpufreq|" ++ " |multicoretemp|" ++ " |top| " ++ dimi "\xf080" ++ " |memory| " ++ dimi "\xf0a0" ++ "|diskio| |disku| " ++ " |datetime| " - ++ " |laTime| " +-- ++ " |laTime| " } where dimi = fc "grey40" . fn 1 isXmonad = pWm p == Just "xmonad" trayT = if isXmonad then "|tray|" else "" |