A bit more reshuffling and some unicode

5 files changed, 20 insertions, 18 deletions

diff --git a/src/Top.hs b/src/Top.hs
index 3e91bb8..246a292 100644
--- a/src/Top.hs
+++ b/src/Top.hs
@@ -5,6 +5,7 @@ import Monitors
 config p = (baseConfig p) {
   position = TopSize C 100 defaultHeight
   , textOffset = defaultHeight - 8
+  , textOffsets = [defaultHeight - 9]
   , border = BottomB
   , commands = [ Run (topProc p)
                , Run (multiCPU p)
@@ -13,14 +14,15 @@ config p = (baseConfig p) {
                , Run (diskU p)
                , Run (diskIO p)
                , Run (coreTemp p)
+               , Run brightness
                , Run kbd
                , Run XMonadLog
                , Run laTime
                , Run localTime
                ]
-  , template = "|kbd| |memory| |top| {|XMonadLog|}\
-               \ |cpufreq| |multicpu|\
-               \ |coretemp| |diskio| |disku| \
+  , template = " |bright| |memory| |top| <fn=2>|kbd|</fn>{|XMonadLog|}\
+               \ |diskio| |disku| |cpufreq| |multicpu|\
+               \ |coretemp| \
                \ |datetime| |laTime| "
 }
 
diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs
index f6c474d..1bbf359 100644
--- a/src/lib/Bottom.hs
+++ b/src/lib/Bottom.hs
@@ -7,18 +7,16 @@ import Monitors
 config cs tpl p = (baseConfig p) {
   position = BottomSize C 100 defaultHeight
   , textOffset = defaultHeight - 6
-  , textOffsets = [defaultHeight - 5]
+  , textOffsets = [defaultHeight - 5, defaultHeight - 6]
   , border = TopB
   , template = "|tray| \
                \<action=`toggle-nm-applet.sh `>|tun0||wlp2s0wi|</action> \
-               \|dynnetwork| \
+               \ |dynnetwork| \
                \|default:Master| |default:Capture| "
              ++ tpl
              ++ " {} |mbox| |EGPH| \
-                \ |bright| \
-                \|uptime| |b0| "
+                \|uptime| |batt0| "
   , commands = [ Run (uptime p)
-               , Run brightness
                , Run (wireless p)
                , Run (dynNetwork p)
                , Run tun0
diff --git a/src/lib/Config.hs b/src/lib/Config.hs
index abdfb22..8351cce 100644
--- a/src/lib/Config.hs
+++ b/src/lib/Config.hs
@@ -54,10 +54,9 @@ baseConfig p = defaultConfig {
   , borderColor = pBorder p
   , fgColor = (pForeground p)
   , bgColor = (pBackground p)
-  -- , border = FullBM 1
+  , additionalFonts = ["xft:Hack-7", "xft:Symbola-9", "xft:Symbola-8"]
   , border = NoBorder
   , alpha = (pAlpha p)
-  , additionalFonts = []
   , overrideRedirect = True
   , lowerOnStart = True
   , hideOnStart = False
diff --git a/src/lib/MPD.hs b/src/lib/MPD.hs
index 3a30699..6079bd3 100644
--- a/src/lib/MPD.hs
+++ b/src/lib/MPD.hs
@@ -7,7 +7,7 @@ import qualified Bottom (config)
 mpd = MPD [ "-W", "12", "-b", "░", "-f", "▒", "-t"
           , " <lapsed> <fc=seashell3><fn=1><bar></fn></fc>"] 10
 
-autoMPD = AutoMPD [ "-T", "160", "-E", "...", "-W", "10", "-t"
+autoMPD = AutoMPD [ "-T", "150", "-E", "...", "-W", "10", "-t"
                   , "<length> <ppos>/<plength> \
                     \<fn=0><fc=darkolivegreen><title></fc></fn> \
                     \<fn=0><album></fn> \
@@ -17,6 +17,5 @@ autoMPD = AutoMPD [ "-T", "160", "-E", "...", "-W", "10", "-t"
 
 config p = (Bottom.config [Run mpd, Run autoMPD] "|mpd| |autompd|" p)
   {
-    additionalFonts = ["xft:Hack-7"]
-  , textOffsets = [defaultHeight - 7]
+  textOffsets = [defaultHeight - 7, defaultHeight - 6]
   }
diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs
index e684a2f..f87e5f5 100644
--- a/src/lib/Monitors.hs
+++ b/src/lib/Monitors.hs
@@ -19,7 +19,8 @@ multiCPU p = MultiCpu (p <~> ["-t", "<autototal>"
 cpuFreq p = CpuFreq (p <~> ["-t" , "<cpu0> <cpu1> <cpu2> <cpu3>"
                            , "-L", "1", "-H", "2", "-S", "Off" , "-d", "2"]) 50
 
-dynNetwork p = DynNetwork (p <~> ["-t", "↑ <tx> ↓ <rx>"
+-- ⤒⤊⍐ ⊼ ⇧  ⇩
+dynNetwork p = DynNetwork (p <~> ["-t", "<fn=2>↑</fn> <tx>  <fn=2>↓</fn> <rx>"
                                  , "-L", "20", "-H", "1024000"
                                  , "-m", "5", "-W", "10", "-S", "Off"]) 10
 
@@ -40,7 +41,7 @@ batt p =
                , "-i", "", "-O", " <timeleft> <watts>"
                , "-o", " <timeleft> <watts>"
                , "-H", "16", "-L", "10"
-               , "-h", "sienna4", "-l", "gray20"]) 50 "b0"
+               , "-h", "sienna4", "-l", "gray20"]) 50 "batt0"
 
 coreTemp p =
   CoreTemp (p <~> ["-t", "<core1>° <core2>°"
@@ -52,8 +53,11 @@ diskU p =
         20
 
 diskIO p =
-  DiskIO [("dm-1", "↑ <read> ↓ <write>")]
-         (p <~> ["-L", "20", "-H", "5000", "-m", "5", "-p", "3"]) 10
+  DiskIO [("dm-1"
+          , "<read><fn=1> <readvbar> </fn> <write><fn=1> <writevbar> </fn>")]
+         (p <~> ["-f", "░", "-b", "─", "-L", "200000", "-H" , "10000000"
+                , "-W", "5", "-w", "5", "-p", "3"])
+         10
 
 mbox = MBox [ ("I", "inbox", "darkseagreen4")
             , ("B", "bigml.spool", "sienna4")
@@ -77,7 +81,7 @@ masterVol =
 
 captureVol = Volume "default" "Capture" ["-t", "<volume>"] 10
 
-kbd = Kbd [("us", ""), ("us(intl)", "*")]
+kbd = Kbd [("us", ""), ("us(intl)", "   ⃣")]
 
 brightness = Brightness ["--", "-D", "intel_backlight"] 10