diff options
| -rwxr-xr-x | bin/run-trayer.sh | 18 | ||||
| -rwxr-xr-x | bin/xmobars.sh | 6 | ||||
| -rw-r--r-- | src/lib/Bottom.hs | 8 | ||||
| -rw-r--r-- | src/lib/Config.hs | 15 | ||||
| -rw-r--r-- | src/lib/MPD.hs | 10 | ||||
| -rw-r--r-- | src/lib/Mpris.hs | 8 |
6 files changed, 35 insertions, 30 deletions
diff --git a/bin/run-trayer.sh b/bin/run-trayer.sh index c9fe71c..0b1a0fa 100755 --- a/bin/run-trayer.sh +++ b/bin/run-trayer.sh @@ -1,9 +1,17 @@ #!/bin/bash -trayer --margin 2 --distancefrom left\ - --distance 575 --edge top \ - --align left \ +# trayer --margin 2 --distancefrom left\ +# --distance 575 --edge top \ +# --align left \ +# --widthtype request \ +# --height 23 --heighttype pixel \ +# --transparent true\ +# --alpha 255 --padding 1 + +trayer --margin 2 --distancefrom left \ + --distance 1 --edge bottom \ + --align left --SetDockType true --SetPartialStrut false \ --widthtype request \ - --height 23 --heighttype pixel \ - --widthtype pixel --transparent true\ + --height 21 --heighttype pixel \ + --transparent true\ --alpha 255 --padding 1 diff --git a/bin/xmobars.sh b/bin/xmobars.sh index 751e3f2..ce94488 100755 --- a/bin/xmobars.sh +++ b/bin/xmobars.sh @@ -1,5 +1,8 @@ #!/bin/bash +killall trayer +run-trayer.sh & + killall xmobar-top xmobar-top $* & killall xmobar-bottom @@ -8,6 +11,3 @@ if pidof spotify>/dev/null; then else xmobar-bottom $* mpd & fi - -killall trayer -run-trayer.sh & diff --git a/src/lib/Bottom.hs b/src/lib/Bottom.hs index 34ce86a..087ba97 100644 --- a/src/lib/Bottom.hs +++ b/src/lib/Bottom.hs @@ -64,14 +64,20 @@ brightness = Brightness ["--", "-D", "intel_backlight"] 10 memory = Memory ["-t","<available> M", "-p", "2"] 20 -config cs p = (baseConfig p) { +config cs tpl p = (baseConfig p) { position = BottomSize C 100 defaultHeight , textOffset = defaultHeight - 6 , textOffsets = [defaultHeight - 5] , border = TopB + , template = "|tray||kbd||default:Master| |default:Capture| " + ++ tpl + ++ " {} |mbox| |EGPH| \ + \|diskio| |disku| · |bright| · |coretemp| \ + \|memory| · |uptime| |b0| " , commands = [ Run (uptime p) , Run brightness , Run (weather "EGPH") -- LEGE, LEBL, KCV0 + , Run (Com "padding-icon.sh" [] "tray" 20) , Run memory , Run (batt p) , Run (coreTemp p) diff --git a/src/lib/Config.hs b/src/lib/Config.hs index 4b4f160..abdfb22 100644 --- a/src/lib/Config.hs +++ b/src/lib/Config.hs @@ -32,14 +32,15 @@ lightPalette = Palette { pNormal = "black" } darkPalette :: Palette -darkPalette = Palette { pNormal = "black" - , pLow = "#4d4d4d" +darkPalette = Palette { pNormal = "grey60" + , pLow = "gray50" , pHigh = "#a0522d" - , pFont = "xft:NotoMono-9,xft:Inconsolata-11" - , pBorder = "black" - , pForeground = "grey50" + , pFont = "xft:Source Code Pro Medium-10" + -- , pFont = "xft:NotoMono-9,xft:Inconsolata-11" + , pBorder = "grey30" + , pForeground = "grey60" , pBackground = "black" - , pAlpha = 102 + , pAlpha = 0 } palette :: IO Palette @@ -58,7 +59,7 @@ baseConfig p = defaultConfig { , alpha = (pAlpha p) , additionalFonts = [] , overrideRedirect = True - , lowerOnStart = False + , lowerOnStart = True , hideOnStart = False , allDesktops = True , persistent = True diff --git a/src/lib/MPD.hs b/src/lib/MPD.hs index da0f954..3a30699 100644 --- a/src/lib/MPD.hs +++ b/src/lib/MPD.hs @@ -15,12 +15,8 @@ autoMPD = AutoMPD [ "-T", "160", "-E", "...", "-W", "10", "-t" \<fc=burlywood4><composer></fc> <date></fn>"] -config p = (Bottom.config [(Run mpd), (Run autoMPD)] p) { - template = "|kbd||default:Master| |default:Capture| \ - \|mpd| |autompd| {} |mbox| \ - \|EGPH| \ - \|diskio| |disku| · |bright| · |coretemp| \ - \|memory| · |uptime| |b0| " - , additionalFonts = ["xft:Hack-7"] +config p = (Bottom.config [Run mpd, Run autoMPD] "|mpd| |autompd|" p) + { + additionalFonts = ["xft:Hack-7"] , textOffsets = [defaultHeight - 7] } diff --git a/src/lib/Mpris.hs b/src/lib/Mpris.hs index 1936d57..4ae98d1 100644 --- a/src/lib/Mpris.hs +++ b/src/lib/Mpris.hs @@ -11,10 +11,4 @@ mpris client = \ <album> <length>" , "-T", "180", "-E", "...", "-M", "100", "-x", ""] 10 -config client p = (Bottom.config [Run (mpris client)] p) { - template = "|kbd||default:Master| |default:Capture| \ - \|mpris2| {} |mbox| \ - \|EGPH| \ - \|diskio| |disku| · |bright| · |coretemp| \ - \|memory| · |uptime| |b0| " - } +config client p = Bottom.config [Run (mpris client)] "|mpris2|" p |