diff options
| -rw-r--r-- | .config/XMonad/lib/Defaults.hs | 17 | ||||
| -rw-r--r-- | .config/XMonad/xmonad.hs | 5 | ||||
| -rw-r--r-- | .config/polybar/config.ini | 50 |
3 files changed, 25 insertions, 47 deletions
diff --git a/.config/XMonad/lib/Defaults.hs b/.config/XMonad/lib/Defaults.hs index e132b09..e4b40eb 100644 --- a/.config/XMonad/lib/Defaults.hs +++ b/.config/XMonad/lib/Defaults.hs @@ -6,7 +6,8 @@ import XMonad.Layout.Tabbed import XMonad.Actions.GridSelect import XMonad.Util.Loggers - +import XMonad.Hooks.StatusBar +import XMonad.Hooks.StatusBar.PP myBorder = "#120F23" myBorder' = "#C44CF2" @@ -96,3 +97,17 @@ myGSConfig colorizer = (buildDefaultGSConfig myGSColorizer) } myGridSelect = myGSConfig myGSColorizer + +myLemonbarCmd = "lemonbar -g 445x28+1475+0 -f 'SauceCodePro:style=Regular:size=11' -f 'Source Han Sans JP Normal:size=11' -B '#e6100b13' -F '#9d00ff'" + +myLemonbarPP = def { + -- wrap "%{B#} %{F#}" " %{F-}%{B-}" + ppCurrent = wrap "%{B#ff0aa3} %{F#FFFFFF}" " %{F-}%{B-}" + , ppVisible = wrap "%{B#83ddc3} %{F#FFFFFF}" " %{F-}%{B-}" + , ppHidden = wrap "%{B#9b1bed} %{F#FFFFFF}" " %{F-}%{B-}" + , ppHiddenNoWindows = wrap " " " " + --, ppVisibleNoWindows = wrap "%{B#ffffff} %{F#9b1bed}" " %{F-}%{B-}" + , ppWsSep = "" + , ppSep = "" + , ppOrder = \(ws:l:t:ex) -> [ws]++[]++[]++ex + } diff --git a/.config/XMonad/xmonad.hs b/.config/XMonad/xmonad.hs index ad75f9d..3b1c995 100644 --- a/.config/XMonad/xmonad.hs +++ b/.config/XMonad/xmonad.hs @@ -8,13 +8,16 @@ import XMonad.Hooks.EwmhDesktops import XMonad.Util.EZConfig import XMonad.Util.Run +import XMonad.Hooks.StatusBar + import Keybindings import Defaults import Hooks main :: IO () main = do - xmonad $ ewmhFullscreen $ ewmh $ docks def { + myLemonbar <- statusBarPipe myLemonbarCmd (pure myLemonbarPP) + xmonad $ withSB myLemonbar $ ewmhFullscreen $ ewmh $ docks def { focusFollowsMouse = True , terminal = myTerminal , borderWidth = myBorderWidth diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index 68faf65..437d2b5 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -91,7 +91,7 @@ batt-full-fg = ${colors.module-color-0} [bar/mybar2] monitor = ${env:MONITOR:HDMI-0} enable-ipc = true -width = 100% +width = 1500 height = 20 offset-x = 0 offset-y = 0 @@ -122,13 +122,13 @@ font-3 = fixed:pixelsize=10;1 ;font-5 = siji:pixelsize=10;1 modules-left = date uptime wlan eth filesystem-root filesystem-home filesystem-hdd cpu temperature memory xwindow -modules-right = pulseaudio ewmh battery +modules-right = battery pulseaudio tray-position = right tray-padding = 2 tray-background = ${colors.systray-bg} -override-redirect = true +override-redirect = false cursor-click = pointer cursor-scroll = ns-resize @@ -136,7 +136,7 @@ cursor-scroll = ns-resize [bar/mybar] ;monitor = ${env:MONITOR:eDP-1} enable-ipc = true -width = 100% +width = 1475 height = 28 offset-x = 0 offset-y = 0 @@ -167,11 +167,7 @@ font-3 = fixed:pixelsize=10;1 ;font-5 = siji:pixelsize=10;1 modules-left = date uptime wlan eth filesystem-root filesystem-home filesystem-hdd cpu temperature memory xwindow -modules-right = pulseaudio ewmh battery - -tray-position = right -tray-padding = 2 -tray-background = ${colors.systray-bg} +modules-right = battery pulseaudio override-redirect = true @@ -355,39 +351,3 @@ label-discharging-foreground = ${colors.batt-discharging-fg} label-full-background = ${colors.batt-full-bg} label-full-foreground = ${colors.batt-full-fg} -[module/ewmh] -type = internal/xworkspaces - -pin-workspaces = false -enable-click = true -enable-scroll = false -format = <label-state> - -label-monitor = %name% - -;label-active = "%{F#f516a4}%{B#232327}%{F#FFFFFF}%{B#f516a4} %name% %{B#f516a4}%{F#232327}%{B-}%{F-}" -label-active = %name% -label-active-foreground = ${colors.ws-active-fg} -label-active-background = ${colors.ws-active-bg} -label-active-underline = ${colors.ws-active-ul} -label-active-padding = 3 - -label-occupied = %name% -label-occupied-foreground = ${colors.ws-occupied-fg} -label-occupied-background = ${colors.ws-occupied-bg} -label-occupied-underline = ${colors.ws-occupied-ul} -label-occupied-padding = 3 - -label-empty = %name% -label-empty-foreground = ${colors.ws-empty-fg} -label-empty-background = ${colors.ws-empty-bg} -label-empty-underline = ${colors.ws-empty-ul} -label-empty-padding = 3 - -label-background = #FFFFFF - -label-urgent = %name% -label-urgent-foreground = #000000 -label-urgent-background = #bd2c40 -label-urgent-underline = #9b0a20 -label-urgent-padding = 0 |