diff options
| -rw-r--r-- | src/Top.hs | 4 | ||||
| -rw-r--r-- | src/lib/Bottom.hs | 9 | ||||
| -rw-r--r-- | src/lib/Config.hs | 7 | ||||
| -rw-r--r-- | src/lib/Monitors.hs | 16 |
4 files changed, 16 insertions, 20 deletions
@@ -2,7 +2,7 @@ import Xmobar import Config import Monitors --- <fn=2> ๐ก </fn> +-- <fn=1> ๐ก </fn> config p = (baseConfig p) { position = TopSize C 100 defaultHeight , textOffset = defaultHeight - 8 @@ -20,7 +20,7 @@ config p = (baseConfig p) { , Run XMonadLog , Run (batt p) ] - , template = " |bright| |memory| |top| <fn=2>|kbd|</fn>\ + , template = " |bright| |memory| |top| <fn=1>|kbd|</fn>\ \{|XMonadLog|}\ \ |diskio| |disku| |cpufreq| |multicpu|\ \ |coretemp| \ diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs index df4d091..9c8646f 100644 --- a/src/lib/Bottom.hs +++ b/src/lib/Bottom.hs @@ -8,17 +8,16 @@ import Monitors config cs tpl p = (baseConfig p) { position = BottomSize C 100 defaultHeight , textOffset = defaultHeight - 6 - , textOffsets = [defaultHeight - 7, defaultHeight - 6, -1, - defaultHeight - 5, defaultHeight - 6, defaultHeight - 6] + , textOffsets = [defaultHeight - 6, defaultHeight - 6, defaultHeight - 4] , border = TopB , template = "|tray| \ \<action=`toggle-nm-applet.sh `>|tun0||wlp2s0wi|</action> \ \ |dynnetwork| \ - \ <action=`toggle-pasystray.sh `><fn=2>๐ง</fn>|default:Master|\ - \ |default:Capture|</action> <fn=6>๐ต</fn>" + \ <action=`toggle-pasystray.sh `><fn=1>๐ง</fn>|default:Master|\ + \ |default:Capture|</action> <fn=2>๐ต</fn>" ++ tpl ++ " {} |mbox| |EGPH| \ - \ <fn=6>โฐ </fn>|uptime| <fn=6>๐ </fn>|datetime| |laTime| " + \ <fn=2>โฐ </fn>|uptime| <fn=2>๐ </fn>|datetime| |laTime| " , commands = [ Run (uptime p) , Run (wireless p) , Run (dynNetwork p) diff --git a/src/lib/Config.hs b/src/lib/Config.hs index 6a11dfc..62627d0 100644 --- a/src/lib/Config.hs +++ b/src/lib/Config.hs @@ -54,12 +54,9 @@ baseConfig p = defaultConfig { , borderColor = pBorder p , fgColor = (pForeground p) , bgColor = (pBackground p) - , additionalFonts = [ "xft:Hack-7" - , "xft:Symbola-9" - , "xft:Symbola-8" - , "xft:IPA Gothic-10" - , "xft:Symbola-11" + , additionalFonts = [ "xft:Symbola-9" , "xft:Symbola-10" + , "xft:Symbola-11" ] , border = NoBorder , alpha = (pAlpha p) diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs index 05dc803..fffce7d 100644 --- a/src/lib/Monitors.hs +++ b/src/lib/Monitors.hs @@ -53,7 +53,7 @@ cpuFreq p = CpuFreq (p <~> ["-t" , "<cpu0> <cpu1> <cpu2> <cpu3>" , "-L", "1", "-H", "2", "-S", "Off" , "-d", "2"]) 50 -- โคโคโ โผ โง โฉ โ โ -dynNetwork p = DynNetwork (p <~> ["-t", "<fn=2>โ</fn> <tx> <fn=2>โ</fn> <rx>" +dynNetwork p = DynNetwork (p <~> ["-t", "<fn=1>โ</fn> <tx> <fn=1>โ</fn> <rx>" , "-L", "20", "-H", "1024000" , "-m", "5", "-W", "10", "-S", "Off"]) 10 @@ -73,7 +73,7 @@ weather st = , ("partly cloudy", "โ
") , ("mostly cloudy", "๐ง") , ("considerable cloudiness", "โ")] - ["-t", "<fn=5><skyConditionS></fn> <tempC>ยฐ <rh>% <windKmh> (<hour>)" + ["-t", "<fn=3><skyConditionS></fn> <tempC>ยฐ <rh>% <windKmh> (<hour>)" , "-L","10", "-H", "25", "--normal", "black" , "--high", "lightgoldenrod4", "--low", "darkseagreen4"] 18000 @@ -87,9 +87,9 @@ batt p = , "--" , "-a", "notify-send -u critical 'Battery running out!!!!!!'" , "-A", "7" - , "-i", "<fn=6>๐</fn>" - , "-O", " <fn=6>๐</fn> <timeleft> <watts>" - , "-o", " <fn=6>๐</fn> <timeleft> <watts>" + , "-i", "<fn=2>๐</fn>" + , "-O", " <fn=2>๐</fn> <timeleft> <watts>" + , "-o", " <fn=2>๐</fn> <timeleft> <watts>" , "-H", "16", "-L", "10" , "-h", "sienna4", "-l", "gray20"] 50 "batt0" @@ -104,14 +104,14 @@ diskU p = diskIO p = DiskIO [("dm-1" --- , "<fn=2>โ</fn> <readb> <fn=2>โ</fn> <writeb> <fn=1><totalbbar></fn>") +-- , "<fn=1>โ</fn> <readb> <fn=1>โ</fn> <writeb> <fn=1><totalbbar></fn>") , "<readb> <writeb> <fn=1><totalbbar></fn>") ] (p <~> ["-f", "โ", "-b", " ", "-L", "200000", "-H" , "10000000" , "-W", "5", "-w", "5", "-p", "3"]) 10 --- <fn=2>๐จ ๐
๐ ๐ฉ</fn> +-- <fn=1>๐จ ๐
๐ ๐ฉ</fn> mbox = MBox [ ("I", "inbox", "darkseagreen4") , ("B", "bigml.spool", "sienna4") , ("S", "bigsup.spool", "sienna4") @@ -119,7 +119,7 @@ mbox = MBox [ ("I", "inbox", "darkseagreen4") , ("X", "xmobar.spool", "darkseagreen4") , ("g", "gnu.spool", "") , ("k", "books.spool", "") - ] ["-d", "/home/jao/var/mail", "-p", "<fn=5>๐ </fn>", "-s", ""] "mbox" + ] ["-d", "/home/jao/var/mail", "-p", "<fn=2>๐ </fn>", "-s", ""] "mbox" masterVol = Volume "default" "Master" |