Bump version 0.15.3

Update fonts
Temporary remove ALSA bindings because of unresolved version errors
Update Stack and Cabal to use GHC 8.6.4
Add missing pointers to Xmobar

2 files changed, 19 insertions, 19 deletions

diff --git a/xmobarrc/bot.hs b/xmobarrc/bot.hs
index 292fec8..86af565 100644
--- a/xmobarrc/bot.hs
+++ b/xmobarrc/bot.hs
@@ -1,6 +1,6 @@
-Config { font = "xft:lucy tewi:style=Regular:pixelsize=11,Efont Biwidth:pixelsize=12,Misc Fixed Wide:size=8"
-       , additionalFonts = [ "xft:Wuncon Siji:style=Regular"
-                           , "xft:lucy tewi:style=Bold:pixelsize=11"
+Config { font = "xft:tewi:style=Regular:pixelsize=11,Efont Biwidth:pixelsize=12,Misc Fixed Wide:size=8"
+       , additionalFonts = [ "xft:Siji:style=Regular"
+                           , "xft:tewi:style=Bold:pixelsize=11"
                            ]
        , bgColor = "#0b0806"
        , fgColor = "#a19782"
@@ -24,26 +24,26 @@ Config { font = "xft:lucy tewi:style=Regular:pixelsize=11,Efont Biwidth:pixelsiz
        , borderWidth = 1
        , iconRoot = "."
        , commands = [ Run StdinReader
-                    , Run Battery [ "-t", "<fn=1><acstatus></fn><left>%"
+                    , Run Battery [ "-t", "<fn=1><acstatus></fn> <left>%"
                                   , "--"
                                   , "-i", "\57914", "-O", "\57913" , "-o", "\57911"
                                   ] 10
-                    , Run Cpu [ "-t", "<fn=1>\57381</fn><total>%" ] 10
+                    , Run Cpu [ "-t", "<fn=1>\57381</fn> <total>%" ] 10
                     , Run CoreTemp [ "-t", "<core0>°C / <core1>°C" ] 10
-                    , Run Memory [ "-t", "<fn=1>\57384</fn><usedratio>%" ] 10
-                    , Run ThermalZone 0 ["-t","<fn=1>\57371</fn><temp>°C"] 10
+                    , Run Memory [ "-t", "<fn=1>\57384</fn> <usedratio>%" ] 10
+                    , Run ThermalZone 0 ["-t","<fn=1>\57371</fn> <temp>°C"] 10
                     , Run ThermalZone 1 ["-t","<temp>°C"] 10
-                    , Run Wireless "wlp3s0" [ "-t", "<fn=1>\57775</fn><essid> @ <quality>%" ] 10
-                    , Run DynNetwork [ "-t", "<fn=1>\57660</fn><rx> / <fn=1>\57659</fn><tx> kbps" ] 10
-                    , Run Kbd [ ("us", "English / ")
-                              , ("ru", "Russian / ")]
+                    , Run Wireless "wlp3s0" [ "-t", "<fn=1>\57775</fn> <essid> @ <quality>%" ] 10
+                    , Run DynNetwork [ "-t", "<fn=1>\57660</fn> <rx> / <fn=1>\57659</fn> <tx> kbps" ] 10
+                    , Run Kbd [ ("us", "English")
+                              , ("ru", "Russian")]
                     , Run Com "/home/free/.xmonad/scripts/xmobar/fcitx.sh" [] "fcitx" 3
                     , Run Locks
-                    , Run MPD [ "-t", "<fn=1><statei></fn><artist> - <title>"
+                    , Run MPD [ "-t", "<fn=1><statei></fn> <artist> - <title>"
                               , "--"
                               , "-P", "\57498", "-Z", "\57499", "-S", "\57497"
                               ] 10
-                    , Run Volume "default" "Master" [ "-t", "<fn=1><status></fn><volume>%" 
+                    , Run Volume "default" "Master" [ "-t", "<fn=1><status></fn> <volume>%" 
                                                     , "--"
                                                     , "--on"   , "\57427"
                                                     , "--off"  , "\57426"
@@ -56,7 +56,7 @@ Config { font = "xft:lucy tewi:style=Regular:pixelsize=11,Efont Biwidth:pixelsiz
        , template = " \
                     \%battery%   %wlp3s0wi%   %dynnetwork%   %StdinReader%\
                     \}\
-                    \%kbd%%fcitx%\
+                    \%kbd% / %fcitx%\
                     \{\
                     \%mpd%   %default:Master%\
                     \ "
diff --git a/xmobarrc/top.hs b/xmobarrc/top.hs
index 0f26e5c..c502cbd 100644
--- a/xmobarrc/top.hs
+++ b/xmobarrc/top.hs
@@ -1,6 +1,6 @@
-Config { font = "xft:lucy tewi:style=Regular:pixelsize=11,Efont Biwidth:pixelsize=12,Misc Fixed Wide:size=8"
-       , additionalFonts = [ "xft:Wuncon Siji:style=Regular"
-                           , "xft:lucy tewi:style=Bold:pixelsize=11"
+Config { font = "xft:tewi:style=Regular:pixelsize=11,Efont Biwidth:pixelsize=12,Misc Fixed Wide:size=8"
+       , additionalFonts = [ "xft:Siji:style=Regular"
+                           , "xft:tewi:style=Bold:pixelsize=11"
                            ]
        , bgColor = "#0b0806"
        , fgColor = "#a19782"
@@ -24,8 +24,8 @@ Config { font = "xft:lucy tewi:style=Regular:pixelsize=11,Efont Biwidth:pixelsiz
        , borderWidth = 1
        , iconRoot = "."
        , commands = [ Run StdinReader
-                    , Run Date "<fn=1>\57893</fn>%d.%m.%y / %A / %H:%M" "date" 10
-                    , Run Weather "UUWW" [ "-t", "<fn=1>\57550</fn><tempC>°C / <rh>% / <pressure> Pa" ] 10000
+                    , Run Date "<fn=1>\57893</fn> %d.%m.%y / %A / %H:%M" "date" 10
+                    , Run Weather "UUWW" [ "-t", "<fn=1>\57550</fn> <tempC>°C / <rh>% / <pressure> Pa" ] 10000
                     ]
        , sepChar = "%"
        , alignSep = "}{"