From a47ada96bcac05aca1330e88f8ec0027999234f5 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sun, 30 Jun 2019 18:12:22 +0100
Subject: more font shuffling

---
 src/lib/Bottom.hs   |  4 +++-
 src/lib/Config.hs   |  3 ++-
 src/lib/Monitors.hs | 26 +++++++++++++-------------
 src/lib/Music.hs    |  2 +-
 4 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs
index 9c8646f..cee9172 100644
--- a/src/lib/Bottom.hs
+++ b/src/lib/Bottom.hs
@@ -8,7 +8,9 @@ import Monitors
 config cs tpl p = (baseConfig p) {
   position = BottomSize C 100 defaultHeight
   , textOffset = defaultHeight - 6
-  , textOffsets = [defaultHeight - 6, defaultHeight - 6, defaultHeight - 4]
+  , textOffsets = [defaultHeight - 6, defaultHeight - 6,
+                   defaultHeight - 4, defaultHeight - 6,
+                   defaultHeight - 7]
   , border = TopB
   , template = "|tray| \
                \<action=`toggle-nm-applet.sh `>|tun0||wlp2s0wi|</action> \
diff --git a/src/lib/Config.hs b/src/lib/Config.hs
index 62627d0..6493bd7 100644
--- a/src/lib/Config.hs
+++ b/src/lib/Config.hs
@@ -57,7 +57,8 @@ baseConfig p = defaultConfig {
   , additionalFonts = [ "xft:Symbola-9"
                       , "xft:Symbola-10"
                       , "xft:Symbola-11"
-                      ]
+                      , "xft:Symbola-11"
+                      , "xft:Hack-7"]
   , border = NoBorder
   , alpha = (pAlpha p)
   , overrideRedirect = True
diff --git a/src/lib/Monitors.hs b/src/lib/Monitors.hs
index fffce7d..2c12d7b 100644
--- a/src/lib/Monitors.hs
+++ b/src/lib/Monitors.hs
@@ -62,18 +62,18 @@ uptime p = Uptime (p <~> [ "-t" , "<days> <hours>", "-m", "3", "-c", "0", "-S"
 
 weather st =
   WeatherX st
-           [ ("clear", "🌣")
-           , ("sunny", "🌣")
-           , ("mostly clear", "🌤")
-           , ("mostly sunny", "🌤")
-           , ("partly sunny", "⛅")
-           , ("fair", "🌑")
-           , ("cloudy","☁")
-           , ("overcast","☁")
-           , ("partly cloudy", "⛅")
-           , ("mostly cloudy", "🌧")
-           , ("considerable cloudiness", "⛈")]
-           ["-t", "<fn=3><skyConditionS></fn> <tempC>° <rh>%  <windKmh> (<hour>)"
+           [ ("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>")
+           , ("cloudy","<fn=3>☁</fn>")
+           , ("overcast","<fn=3>☁</fn>")
+           , ("partly cloudy", "<fn=3>⛅</fn>")
+           , ("mostly cloudy", "<fn=4>🌧</fn>")
+           , ("considerable cloudiness", "<fn=4>⛈</fn>")]
+           ["-t", "<skyConditionS> <tempC>° <rh>%  <windKmh> (<hour>)"
            , "-L","10", "-H", "25", "--normal", "black"
            , "--high", "lightgoldenrod4", "--low", "darkseagreen4"]
            18000
@@ -105,7 +105,7 @@ diskU p =
 diskIO p =
   DiskIO [("dm-1"
 --          , "<fn=1>⎗</fn> <readb> <fn=1>⎘</fn> <writeb> <fn=1><totalbbar></fn>")
-          , "<readb> <writeb> <fn=1><totalbbar></fn>")
+          , "<readb> <writeb> <fn=0><totalbbar></fn>")
          ]
          (p <~> ["-f", "░", "-b", " ", "-L", "200000", "-H" , "10000000"
                 , "-W", "5", "-w", "5", "-p", "3"])
diff --git a/src/lib/Music.hs b/src/lib/Music.hs
index eca8eb6..949f13d 100644
--- a/src/lib/Music.hs
+++ b/src/lib/Music.hs
@@ -15,7 +15,7 @@ mpris client =
 mprisConfig client p = Bottom.config [Run (mpris client)] "|mpris2|" p
 
 mpd = MPD [ "-W", "12", "-b", "░", "-f", "▒", "-t"
-          , " <lapsed> <fc=seashell3><fn=1><bar></fn></fc>"] 10
+          , " <lapsed> <fc=honeydew3><fn=5><bar></fn></fc>"] 10
 
 autoMPD = AutoMPD [ "-T", "150", "-E", "...", "-W", "10", "-t"
                   , "<length> <ppos>/<plength> \
-- 
cgit v1.2.3