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

8 files changed, 36 insertions, 37 deletions

diff --git a/cabal.project b/cabal.project
index 2f7a15c..f8ea299 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,3 +1,4 @@
 packages: ./
           ./vendor/xmonad/
           ./vendor/xmonad-contrib/
+          ./vendor/xmobar/
diff --git a/src/XMonad/Custom/Bindings.hs b/src/XMonad/Custom/Bindings.hs
index 9400de7..772b0ad 100644
--- a/src/XMonad/Custom/Bindings.hs
+++ b/src/XMonad/Custom/Bindings.hs
@@ -54,7 +54,6 @@ import           XMonad.Prompt.Shell
 import           XMonad.Prompt.Window
 import           XMonad.Prompt.Workspace
 import qualified XMonad.StackSet                     as S
-import           XMonad.Util.ALSA
 import           XMonad.Util.EZConfig
 import           XMonad.Util.NamedScratchpad
 import           XMonad.Util.WorkspaceCompare
@@ -147,10 +146,11 @@ keysSystem _ =
 
 keysMedia :: XConfig Layout -> [(String, X ())]
 keysMedia _ =
-    [ ("<XF86AudioMute>"        , void   toggleMute)
-    , ("<XF86AudioLowerVolume>" , void $ lowerVolume 5)
-    , ("<XF86AudioRaiseVolume>" , void $ raiseVolume 5)
-    , ("<XF86AudioPlay>"        , spawn "~/.xmonad/scripts/mpc-play-pause.sh")
+    [
+ -- , ("<XF86AudioMute>"        , void   toggleMute)
+ -- , ("<XF86AudioLowerVolume>" , void $ lowerVolume 5)
+ -- , ("<XF86AudioRaiseVolume>" , void $ raiseVolume 5)
+      ("<XF86AudioPlay>"        , spawn "~/.xmonad/scripts/mpc-play-pause.sh")
     , ("<XF86AudioStop>"        , spawn "mpc --no-status stop")
     , ("<XF86AudioPrev>"        , spawn "mpc --no-status prev")
     , ("<XF86AudioNext>"        , spawn "mpc --no-status next")
diff --git a/src/XMonad/Custom/Theme.hs b/src/XMonad/Custom/Theme.hs
index ed3cb8d..d25cb55 100644
--- a/src/XMonad/Custom/Theme.hs
+++ b/src/XMonad/Custom/Theme.hs
@@ -46,7 +46,7 @@ import           XMonad.Layout.Decoration
 import qualified XMonad.Prompt            as P
 
 font :: String
-font = "xft:lucy tewi:style=Regular:size=8" -- TODO CJKのフォールバックフォントを追加する
+font = "xft:tewi:style=Regular:size=8" -- TODO CJKのフォールバックフォントを追加する
 
 black1, black2 :: String -- TODO get variables from Xresources
 (black1, black2) =
diff --git a/stack.yaml b/stack.yaml
index 9700dbb..e18ff0c 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,7 +1,6 @@
-resolver: lts-12.19
+resolver: lts-13.19
 packages:
     - .
     - ./vendor/xmonad
     - ./vendor/xmonad-contrib
-extra-deps:
-    - alsa-mixer-0.2.0.3
+    - ./vendor/xmobar
diff --git a/vendor/xmonad-contrib b/vendor/xmonad-contrib
-Subproject fddd5ea1febccb4c09806c7426e9636fef22401
+Subproject dd89eae446a0901d5913276a0de59a6f8e3736d
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 = "}{"
diff --git a/xmonad-ng.cabal b/xmonad-ng.cabal
index ad775bb..0e2292f 100644
--- a/xmonad-ng.cabal
+++ b/xmonad-ng.cabal
@@ -1,7 +1,7 @@
 name:          xmonad-ng
-version:       0.15.2
+version:       0.15.3
 synopsis:      XMonad configuration
-description:   XMonad configuration hacked together via stolen code and bad Haskell
+description:   XMonad configuration hacked together using stolen code and bad Haskell
                knowledge
 license:       BSD3
 license-file:  LICENSE
@@ -10,13 +10,13 @@ author:        azahi@teknik.io
 maintainer:    azahi@teknik.io
 stability:     experimental
 category:      System
-homepage:      https://github.com/azahi/xmonad-ng
+homepage:      https://git.systemd.club/xmonad-config
 build-type:    Simple
-cabal-version: >= 1.10
+cabal-version: >= 2.0
 
 source-repository head
   type:     git
-  location: https://github.com/azahi/xmonad-ng
+  location: https://git.systemd.club/xmonad-config
 
 executable xmonad-ng
   main-is:          Main.hs
@@ -34,12 +34,11 @@ executable xmonad-ng
                     XMonad.Custom.Startup
                     XMonad.Custom.Theme
                     XMonad.Custom.Workspaces
-                    XMonad.Util.ALSA
   hs-source-dirs:   src
-  build-depends:    base           >= 4.11 && < 4.12
+  build-depends:    base           >= 4.12 && < 4.13
                   , X11            >= 1.9 && < 1.10
-                  , alsa-mixer     >= 0.2 && < 0.3
-                  , containers     >= 0.5 && < 0.6
+               -- , alsa-mixer     >= 0.3 && < 0.4
+                  , containers     >= 0.6 && < 0.7
                   , directory      >= 1.3 && < 1.4
                   , filepath       >= 1.4 && < 1.5
                   , mtl            >= 2.2 && < 2.3