From 277837c7eeec53aa973ad437a1b3575b3a693092 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azahi@teknik.io>
Date: Wed, 19 Feb 2020 20:57:30 +0300
Subject: Fix xmobar overlap error

Fix xmobar's issue with not restarting itself if the process is not strictly
bound to XMonad with StdinReader. Now we will only launch the bottom bar once
(on initial startup).
---
 src/XMonad/Custom/Log.hs     | 4 ----
 src/XMonad/Custom/Startup.hs | 3 ++-
 xmobarrc/bot.hs              | 8 ++++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/XMonad/Custom/Log.hs b/src/XMonad/Custom/Log.hs
index b10fcdf..34934d9 100644
--- a/src/XMonad/Custom/Log.hs
+++ b/src/XMonad/Custom/Log.hs
@@ -61,7 +61,6 @@ logHook = do
     currentWorkspaceOnTop
     ewmhDesktopsLogHook
     t <- getNamedPipe "xmobarTop"
-    b <- getNamedPipe "xmobarBot"
     c <- wsContainingCopies
     let copiesCurrent ws | ws `elem` c = xmobarColor yellow2 "" . xmobarFont 2 . wrap "*" "=" $ ws
                          | otherwise   = xmobarColor white2  "" . xmobarFont 2 . wrap "=" "=" $ ws
@@ -75,6 +74,3 @@ logHook = do
         , ppUrgent  = copiesUrgent
         , ppOutput  = safePrintToPipe t
         }
-    dynamicLogWithPP $ botBarPP
-        { ppOutput  = safePrintToPipe b
-        }
diff --git a/src/XMonad/Custom/Startup.hs b/src/XMonad/Custom/Startup.hs
index aa9340f..85d52ad 100644
--- a/src/XMonad/Custom/Startup.hs
+++ b/src/XMonad/Custom/Startup.hs
@@ -18,6 +18,7 @@ import           XMonad.Hooks.ManageDocks
 import           XMonad.Hooks.SetWMName
 import           XMonad.Util.Cursor
 import           XMonad.Util.SpawnNamedPipe
+import           XMonad.Util.SpawnOnce
 
 atomsToFullscreen :: [String]
 atomsToFullscreen =
@@ -49,7 +50,7 @@ addEWMHFullscreen = do
 startupHook :: X ()
 startupHook = do
     spawnNamedPipe "xmobar ~/.xmonad/xmobarrc/top.hs" "xmobarTop"
-    spawnNamedPipe "xmobar ~/.xmonad/xmobarrc/bot.hs" "xmobarBot"
+    spawnOnce "xmobar ~/.xmonad/xmobarrc/bot.hs"
     docksStartupHook
     addEWMHFullscreen
     setDefaultCursor xC_left_ptr
diff --git a/xmobarrc/bot.hs b/xmobarrc/bot.hs
index d9428e0..13b942e 100644
--- a/xmobarrc/bot.hs
+++ b/xmobarrc/bot.hs
@@ -23,15 +23,15 @@ Config { font = "xft:tewi:style=Regular:pixelsize=11,Biwidth:pixelsize=12"
        , borderColor = "#2f2b2a"
        , borderWidth = 1
        , iconRoot = "."
-       , commands = [ Run StdinReader
-                    , Run Battery [ "-t", "<fn=1><acstatus></fn> <left>%"
+       , commands = [ Run Battery [ "-t", "<fn=1><acstatus></fn> <left>%"
                                   , "--"
                                   , "-i", "\57914", "-O", "\57913" , "-o", "\57911"
                                   ] 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")]
+                              , ("ru", "Русский")
+                              ]
                     , Run Com "/home/free/.xmonad/scripts/xmobar/fcitx.sh" [] "fcitx" 3
                     , Run Locks
                     , Run MPD [ "-t", "<fn=1><statei></fn> <artist> - <title>"
@@ -49,7 +49,7 @@ Config { font = "xft:tewi:style=Regular:pixelsize=11,Biwidth:pixelsize=12"
        , sepChar = "%"
        , alignSep = "}{"
        , template = " \
-                    \%battery%   %wlp3s0wi%   %dynnetwork%   %StdinReader%\
+                    \%battery%   %wlp3s0wi%   %dynnetwork%\
                     \}\
                     \%kbd% / %fcitx%\
                     \{\
-- 
cgit 1.4.1