diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Bottom.hs | 3 | ||||
| -rw-r--r-- | src/Top.hs | 3 | ||||
| -rw-r--r-- | src/TopC.hs | 45 | ||||
| -rw-r--r-- | src/lib/Bottom.hs | 8 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 52 |
5 files changed, 89 insertions, 22 deletions
diff --git a/src/Bottom.hs b/src/Bottom.hs index a13662b..92e2d3e 100644 --- a/src/Bottom.hs +++ b/src/Bottom.hs @@ -8,5 +8,4 @@ import System.Environment (getArgs) main :: IO () main = do args <- getArgs - let mpris = if null args then "spotify" else last args - palette >>= configFromArgs . Music.config mpris >>= xmobar + palette >>= configFromArgs . Music.config "spotify" >>= xmobar @@ -23,8 +23,7 @@ config p = (baseConfig p) { , template = " |bright| |memory| |top| <fn=1>|kbd|</fn>\ \{|XMonadLog|}\ \ |diskio| |disku| |cpufreq| |multicpu|\ - \ |coretemp| \ - \ |batt0| " + \ |multicoretemp| |batt0| " } main :: IO () diff --git a/src/TopC.hs b/src/TopC.hs new file mode 100644 index 0000000..e4529ae --- /dev/null +++ b/src/TopC.hs @@ -0,0 +1,45 @@ +import Xmobar +import Config +import Monitors + +-- <fn=1> ๐ก </fn> +config p = (baseConfig p) { + position = TopSize C 100 (defaultHeight - 1) + , textOffset = defaultHeight - 8 + , textOffsets = [defaultHeight - 9, defaultHeight - 9, + defaultHeight - 6, defaultHeight - 8] + , border = BottomB + , alpha = 255 + , commands = [ Run (topProc' p) + , Run (multiCPU p) + , Run memory + , Run (diskU p) + , Run (diskIO p) + , Run (coreTemp p) + , Run brightness + , Run (batt p) + , Run (wireless p) + , Run (dynNetwork p) + , Run tun0 + , Run (weather "EGPH") -- LEGE, LEBL, KCV0 + , Run mail + , Run masterVol + , Run captureVol + , Run laTime + , Run localTime + ] + , template = " |batt0| |bright|\ + \ <action=`toggle-app.sh nm-applet`>|tun0||wlp2s0wi|</action> \ + \ |dynnetwork| \ + \ <action=`toggle-app.sh blueman-tray`><fn=1>๐ง</fn></action>\ + \<action=`toggle-app.sh pasystray`>|default:Master|\ + \ |default:Capture|</action> |EGPH|\ + \ |mail| {} \ + \ |top| |multicpu| |multicoretemp|\ + \ |diskio| |disku| |memory| \ + \ <fn=2>๐ </fn>|datetime| |laTime| " +} + +main :: IO () +main = + palette >>= configFromArgs . config >>= xmobar diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs index dd0f534..a4e907e 100644 --- a/src/lib/Bottom.hs +++ b/src/lib/Bottom.hs @@ -13,12 +13,12 @@ config cs tpl p = (baseConfig p) { defaultHeight - 7] , border = TopB , template = "|tray| \ - \<action=`toggle-nm-applet.sh `>|tun0||wlp2s0wi|</action> \ + \<action=`toggle-app.sh nm-applet`>|tun0||wlp2s0wi|</action> \ \ |dynnetwork| \ - \ <action=`toggle-pasystray.sh `><fn=1>๐ง</fn>|default:Master|\ + \ <action=`toggle-app.sh pasystray`><fn=1>๐ง</fn>|default:Master|\ \ |default:Capture|</action> <fn=2>๐ต</fn>" ++ tpl - ++ " {} |mbox| |EGPH| \ + ++ " {} |mail| |EGPH| \ \ <fn=2>๐ </fn>|uptime| <fn=2>๐ </fn>|datetime| |laTime| " , commands = [ Run (uptime p) , Run (wireless p) @@ -26,7 +26,7 @@ config cs tpl p = (baseConfig p) { , Run tun0 , Run (weather "EGPH") -- LEGE, LEBL, KCV0 , Run trayPadding - , Run mbox + , Run mail , Run masterVol , Run captureVol , Run laTime diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index 473eebf..3c35488 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -40,6 +40,10 @@ topProc p = TopProc (p <~> ["-t" , "<mboth3> <mboth2> <mboth1> \ \ยท <both3> <both2> <both1>" , "-w", "10", "-L" , "10", "-H", "80"]) 15 +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 @@ -60,18 +64,21 @@ dynNetwork p = DynNetwork (p <~> ["-t", "<fn=1>โ</fn> <tx> <fn=1>โ</fn> <rx uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S" , "On" , "-L", "10", "-H", "100"]) 600 +-- ๐ง weather st = WeatherX st - [ ("clear", "<fn=4>๐ฃ</fn>") + [ ("", "<fc=gray60><fn=4>๐</fn></fc>") + , ("clear", "<fn=4>๐ฃ</fn>") , ("sunny", "<fn=4>๐ฃ</fn>") , ("mostly clear", "<fn=4>๐ค</fn>") , ("mostly sunny", "<fn=4>๐ค</fn>") , ("partly sunny", "<fn=3>โ
</fn>") , ("fair", "<fn=4>๐</fn>") + , ("obscured", "<fn=4>๐</fn>") -- ๐ซ , ("cloudy","<fn=3>โ</fn>") , ("overcast","<fn=3>โ</fn>") , ("partly cloudy", "<fn=3>โ
</fn>") - , ("mostly cloudy", "<fn=4>๐ง</fn>") + , ("mostly cloudy", "<fn=3>โ</fn>") , ("considerable cloudiness", "<fn=4>โ</fn>")] ["-t", "<skyConditionS> <tempC>ยฐ <rh>% <windKmh> (<hour>)" , "-L","10", "-H", "25", "--normal", "black" @@ -94,8 +101,8 @@ batt p = , "-h", "sienna4", "-l", "gray20"] 50 "batt0" coreTemp p = - CoreTemp (p <~> ["-t", "<core1>ยฐ <core2>ยฐ" - , "-L", "50", "-H", "75", "-d", "0"]) 50 + MultiCoreTemp (p <~> ["-t", "<avg>ยฐ" + , "-L", "50", "-H", "75", "-d", "0"]) 50 diskU p = DiskU [("dm-1", "<used>") , ("/media/sdb", " s <used>")] @@ -111,21 +118,38 @@ diskIO p = , "-W", "5", "-w", "5", "-p", "3"]) 10 --- <fn=1>๐จ ๐
๐ ๐ฉ</fn> -mbox = MBox [ ("I", "inbox", "darkseagreen4") - , ("B", "bigml.spool", "sienna4") - , ("S", "bigsup.spool", "sienna4") - , ("G", "geiser.spool", "darkseagreen4") - , ("X", "xmobar.spool", "darkseagreen4") - , ("g", "gnu.spool", "") - , ("k", "books.spool", "") - ] ["-d", "/home/jao/var/mail", "-p", "<fn=2>๐ </fn>", "-s", ""] "mbox" +-- <fn=1>๐จ ๐
๐ ๐ฉ โ </fn> +mbox = MBox [ ("L", "/var/mail/jao", "grey60") + -- , ("B", "bigml.spool", "sienna4") + -- , ("S", "bigsup.spool", "sienna4") + -- , ("G", "geiser.spool", "darkseagreen4") + -- , ("X", "xmobar.spool", "darkseagreen4") + -- , ("g", "gnu.spool", "") + -- , ("k", "books.spool", "") + ] [] -- ["-p", "<fn=2>๐ฉ </fn>", "-s", ""] + "mbox" + +mail = Mail [ ("I", "~/var/maildir/jao/inbox") + , ("G", "~/var/maildir/jao/geiser") + , ("X", "~/var/maildir/jao/xmobar") + , ("B", "~/var/maildir/bigml/inbox") + , ("S", "~/var/maildir/bigml/support") + ] + "mail" + +-- mail = Mail [ ("<fc=darkseagreen4><fn=2>๐ </fn></fc>", "~/var/maildir/jao/inbox") +-- , ("<fc=darkseagreen3><fn=2>๐ </fn></fc>", "~/var/maildir/jao/geiser") +-- , ("<fc=darkseagreen3><fn=2>๐ </fn></fc>", "~/var/maildir/jao/xmobar") +-- , ("<fc=sienna2><fn=2>๐ </fn></fc>", "~/var/maildir/bigml/inbox") +-- , ("<fc=sienna4><fn=2>๐ </fn></fc>", "~/var/maildir/bigml/support") +-- ] +-- "mail" masterVol = Volume "default" "Master" ["-t", "<status> <volume>" , "--", "-C", "black", "-c", "sienna4", "-O", "" - , "-o", " ร"] 10 + , "-o", " <fn=4>๐</fn>"] 10 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10 |