Unicode candy

3 files changed, 14 insertions, 12 deletions

diff --git a/src/Top.hs b/src/Top.hs
index 246a292..c9f06d6 100644
--- a/src/Top.hs
+++ b/src/Top.hs
@@ -17,13 +17,12 @@ config p = (baseConfig p) {
                , Run brightness
                , Run kbd
                , Run XMonadLog
-               , Run laTime
-               , Run localTime
+               , Run (batt p)
                ]
   , template = " |bright| |memory| |top| <fn=2>|kbd|</fn>{|XMonadLog|}\
                \ |diskio| |disku| |cpufreq| |multicpu|\
                \ |coretemp| \
-               \ |datetime| |laTime| "
+               \ |batt0| "
 }
 
 main :: IO ()
diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs
index 176c3b3..a99b873 100644
--- a/src/lib/Bottom.hs
+++ b/src/lib/Bottom.hs
@@ -4,27 +4,29 @@ import Xmobar
 import Config
 import Monitors
 
+-- ⛅
 config cs tpl p = (baseConfig p) {
   position = BottomSize C 100 defaultHeight
   , textOffset = defaultHeight - 6
-  , textOffsets = [defaultHeight - 5, defaultHeight - 6, -1, defaultHeight - 5]
+  , textOffsets = [defaultHeight - 7, defaultHeight - 6, -1, defaultHeight - 5]
   , border = TopB
   , template = "|tray| \
                \<action=`toggle-nm-applet.sh `>|tun0||wlp2s0wi|</action> \
                \ |dynnetwork| \
-               \|default:Master| |default:Capture| "
+               \ <fn=2>🎧</fn>|default:Master| |default:Capture|  <fn=2>🎵</fn>"
              ++ tpl
-             ++ " {} |mbox| |EGPH| \
-                \|uptime| |batt0| "
+             ++ " {} |mbox| <fn=2>🌤</fn> |EGPH| \
+                \ <fn=2>⏰ </fn>|uptime| <fn=2>🕓 </fn>|datetime| |laTime| "
   , commands = [ Run (uptime p)
                , Run (wireless p)
                , Run (dynNetwork p)
                , Run tun0
                , Run (weather "EGPH") -- LEGE, LEBL, KCV0
                , Run trayPadding
-               , Run (batt p)
                , Run mbox
                , Run masterVol
                , Run captureVol
+               , Run laTime
+               , Run localTime
                ] ++ cs
 }
diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs
index d5ddd6b..1ad3c89 100644
--- a/src/lib/Monitors.hs
+++ b/src/lib/Monitors.hs
@@ -67,12 +67,12 @@ weather st =
 
 batt p =
   BatteryN ["BAT0"]
-           ((p <~> ["-t", "<left>%<acstatus>"
+           ((p <~> ["-t", "<acstatus> <left>%"
                    , "-S", "Off", "-d", "0", "-m", "3"
                    , "-L", "10", "-H", "80", "-p", "3"])
             ++ [ "--"
-               , "-i", "", "-O", " <timeleft> <watts>"
-               , "-o", " <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"
 
@@ -91,6 +91,7 @@ diskIO p =
                 , "-W", "5", "-w", "5", "-p", "3"])
          10
 
+-- <fn=2>📨 🖅 🖃 📩</fn>
 mbox = MBox [ ("I", "inbox", "darkseagreen4")
             , ("B", "bigml.spool", "sienna4")
             , ("S", "bigsup.spool", "sienna4")
@@ -98,7 +99,7 @@ mbox = MBox [ ("I", "inbox", "darkseagreen4")
             , ("X", "xmobar.spool", "darkseagreen4")
             , ("g", "gnu.spool", "")
             , ("k", "books.spool", "")
-            ] ["-d", "/home/jao/var/mail", "-p", " ", "-s", ""] "mbox"
+            ] ["-d", "/home/jao/var/mail", "-p", "<fn=2>🖄 </fn>", "-s", ""] "mbox"
 
 masterVol =
   Volume "default" "Master"