From 20a112ca924e00cb328a01e643a7d806db1f1782 Mon Sep 17 00:00:00 2001 From: David Luevano Alvarado <55825613+luevano@users.noreply.github.com> Date: Tue, 22 Dec 2020 13:33:22 -0700 Subject: Separate bars and make common config for bars --- .config/bspwm/bspwmrc | 7 ++----- .config/polybar/common.ini | 42 ++++++++++++++++++++++++++++++++++++++ .config/polybar/config | 7 ++++++- .config/polybar/main.ini | 42 +------------------------------------- .config/polybar/pulseaudio.ini | 8 ++++---- .config/polybar/second.ini | 46 +----------------------------------------- 6 files changed, 56 insertions(+), 96 deletions(-) create mode 100644 .config/polybar/common.ini (limited to '.config') diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 1ccfe1f..461993a 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -44,7 +44,7 @@ else fi # -# Config. +# Config (defaults). # # General. @@ -85,11 +85,8 @@ bspc config normal_border_color $COLOR_BLACK_ALT bspc config active_border_color $COLOR_YELLOW bspc config focused_border_color $COLOR_CYAN -# # Rules. -# - -# Windows. +bspc rule -a *:*:"Picture-in-Picture" state=floating rectangle=640x360+640+360 # bspc rule -a Gimp desktop='^8' state=floating follow=on # bspc rule -a Chromium desktop='^2' # bspc rule -a mplayer2 state=floating diff --git a/.config/polybar/common.ini b/.config/polybar/common.ini new file mode 100644 index 0000000..1d4cf8e --- /dev/null +++ b/.config/polybar/common.ini @@ -0,0 +1,42 @@ +[bar/common] +width = 100% +height = 24 +offset-x = 0% +offset-y = 0% +radius = 0.0 +fixed-center = false + +font-0 = Noto Sans Mono:pixelsize=10;1 +font-1 = Noto Color Emoji:scale=10;1 +font-2 = Font Awesome 5 Free:pixelsize=10;1 +font-3 = Font Awesome 5 Free Solid:pixelsize=10;1 +font-4 = Font Awesome 5 Brands:pixelsize=10;1 + +background = ${colors.background} +foreground = ${colors.blue} + +line-size = 2 +line-color = ${colors.blue} + +border-size = 0 +border-color = ${colors.black} + +padding-left = 0 +padding-right = 0 + +module-margin-left = 1 +module-margin-right = 1 + +override-redirect = true + +wm-restack = bspwm +# wm-restack = i3 + +# scroll-up = bspwm-desknext +# scroll-down = bspwm-deskprev + +# scroll-up = i3wm-wsnext +# scroll-down = i3wm-wsprev + +cursor-click = pointer +cursor-scroll = ns-resize diff --git a/.config/polybar/config b/.config/polybar/config index a04d931..04fa578 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -30,10 +30,15 @@ screenchange-reload = true # pseudo-transparency = false [global/wm] -margin-top = 40 +margin-top = 24 margin-bottom = 0 + +# Include bars. +include-file = /home/lz/.config/polybar/common.ini include-file = /home/lz/.config/polybar/main.ini include-file = /home/lz/.config/polybar/second.ini + +# Include modules. include-file = /home/lz/.config/polybar/bspwm.ini include-file = /home/lz/.config/polybar/xwindow.ini include-file = /home/lz/.config/polybar/pulseaudio.ini diff --git a/.config/polybar/main.ini b/.config/polybar/main.ini index c02134c..a30f346 100644 --- a/.config/polybar/main.ini +++ b/.config/polybar/main.ini @@ -1,32 +1,6 @@ [bar/main] +inherit = bar/common monitor = ${env:MAINMON:HDMI-0} -width = 100% -height = 24 -offset-x = 0% -offset-y = 0% -radius = 0.0 -fixed-center = false - -font-0 = Noto Sans Mono:pixelsize=10;1 -font-1 = Noto Color Emoji:scale=10;1 -font-2 = Font Awesome 5 Free:pixelsize=10;1 -font-3 = Font Awesome 5 Free Solid:pixelsize=10;1 -font-4 = Font Awesome 5 Brands:pixelsize=10;1 - -background = ${colors.background} -foreground = ${colors.blue} - -line-size = 2 -line-color = ${colors.blue} - -border-size = 0 -border-color = ${colors.black} - -padding-left = 0 -padding-right = 0 - -module-margin-left = 1 -module-margin-right = 1 modules-left=bspwm modules-center=xwindow @@ -35,17 +9,3 @@ modules-right=date pulseaudio powermenu tray-position = right tray-padding = 2 # tray-background = ${colors.cyan} - -override-redirect = true - -wm-restack = bspwm -# wm-restack = i3 - -# scroll-up = bspwm-desknext -# scroll-down = bspwm-deskprev - -# scroll-up = i3wm-wsnext -# scroll-down = i3wm-wsprev - -cursor-click = pointer -cursor-scroll = ns-resize diff --git a/.config/polybar/pulseaudio.ini b/.config/polybar/pulseaudio.ini index c2f5bb4..1aa7548 100644 --- a/.config/polybar/pulseaudio.ini +++ b/.config/polybar/pulseaudio.ini @@ -25,12 +25,12 @@ format-volume-underline = ${colors.green} # # format-muted = +format-muted-underline = ${colors.white} # Available tokens: # %percentage% (default) # %decibels% label-volume = %percentage%% -# label-volume-foreground = ${colors.foreground} # Available tokens: # %percentage% (default) @@ -45,8 +45,8 @@ ramp-volume-2 =  # Right and Middle click # click-middle = -# click-left = -# click-middle = +# click-left = +# click-middle = click-right = pavucontrol # scroll-up = # scroll-down = @@ -59,7 +59,7 @@ bar-volume-foreground-0 = ${colors.green} bar-volume-foreground-1 = ${colors.green} bar-volume-foreground-2 = ${colors.green} bar-volume-foreground-3 = ${colors.green} -bar-volume-foreground-4 = ${colors.green} +bar-volume-foreground-4 = ${colors.yellow} bar-volume-foreground-5 = ${colors.yellow} bar-volume-foreground-6 = ${colors.red} bar-volume-gradient = false diff --git a/.config/polybar/second.ini b/.config/polybar/second.ini index 132c3df..cefaa3b 100644 --- a/.config/polybar/second.ini +++ b/.config/polybar/second.ini @@ -1,51 +1,7 @@ [bar/second] +inherit = bar/common monitor = ${env:SECMON:HDMI-0} -width = 100% -height = 24 -offset-x = 0% -offset-y = 0% -radius = 0.0 -fixed-center = false - -font-0 = Noto Sans Mono:pixelsize=10;1 -font-1 = Noto Color Emoji:scale=10;1 -font-2 = Font Awesome 5 Free:pixelsize=10;1 -font-3 = Font Awesome 5 Free Solid:pixelsize=10;1 -font-4 = Font Awesome 5 Brands:pixelsize=10;1 - -background = ${colors.background} -foreground = ${colors.blue} - -line-size = 2 -line-color = ${colors.blue} - -border-size = 0 -border-color = ${colors.black} - -padding-left = 0 -padding-right = 0 - -module-margin-left = 1 -module-margin-right = 2 modules-left=bspwm modules-center=xwindow modules-right=date - -# tray-position = right -# tray-padding = 2 -# tray-background = ${colors.cyan} - -override-redirect = true - -wm-restack = bspwm -# wm-restack = i3 - -# scroll-up = bspwm-desknext -# scroll-down = bspwm-deskprev - -# scroll-up = i3wm-wsnext -# scroll-down = i3wm-wsprev - -cursor-click = pointer -cursor-scroll = ns-resize -- cgit v1.2.3-54-g00ecf