fixes + added bar bases

.config/polybar/config-merge/c02-config-bars-base

@@ -1,4 +1,4 @@
-[bar/master]
+[bar/base_master]
 background = ${colors.background}
 foreground = ${colors.foreground}
 fixed-center = true
@@ -7,54 +7,47 @@ font-1 = Material Design Icons:fontformat=truetype:pixelsize=10:antialias=true;1
 line-size = 1
 module-margin-left = 1
 module-margin-right = 1
-monitor = ${env:MONITOR:DP-4}
 padding= 2
 separator =|
 override-redirect = true
 
-[bar/border]
-inherit="bar/master"
+[bar/base_border]
+inherit="bar/base_master"
 border-size=2
 border-color=${colors.border}
 radius = 15.0
 
-[bar/floating]
-inherit="bar/border"
+[bar/base_floating]
+inherit="bar/base_border"
 bottom = true
 enable-ipc = false
 height = 40px
 width = 60%
-;modules-center = cava clock playerctl_long
-modules-center = cava
-modules-left = floating_popup_button pavucontrol_button
-modules-right = sensors_cpu_pc nvgpu memory 
-monitor = ${env:MONITOR:DP-4}
 offset-x = 20%
 offset-y = 8px
 override-redirect = true
 tray-detached = true
 tray-maxsize = 15
-tray-offset-x=86
+tray-offset-x= 86
 tray-offset-y = 4px
 tray-padding = 3
 tray-position = left
 tray-scale = 0.8
 
-[bar/floating_popup]
-inherit="bar/border"
+[bar/base_floating_popup]
+inherit="bar/base_border"
 bottom = true
 enable-ipc = true
 height = 40px
 width = 22%
-modules-left = disk_short_pc checkupdates ovpn nvpn eth_pc 
 offset-x = 20%
 offset-y = 58px
 
-[bar/floating_wm]
-inherit="bar/master"
+[bar/base_floating_wm]
+inherit="bar/base_master"
 font-0 = dark forest:style=Bold:fontformat=truetype:pixelsize=10;4
 height = 15
 width = 100%
 modules-center = i3
 padding= 4
-wm-restack = i3
+wm-restack = i3

.config/polybar/config-merge/c03-config-bars

@@ -0,0 +1,16 @@
+[bar/floating]
+inherit="bar/base_floating"
+monitor = ${env:MONITOR:DP-4}
+;modules-center = cava clock playerctl_long
+modules-center = cava
+modules-left = floating_popup_button pavucontrol_button
+modules-right = sensors_cpu_pc nvgpu memory
+
+[bar/floating_popup]
+inherit="bar/base_floating_popup"
+monitor = ${env:MONITOR:DP-4}
+modules-left = disk_short_pc checkupdates ovpn nvpn eth_pc 
+
+[bar/floating_wm]
+inherit="bar/base_floating_wm"
+monitor = ${env:MONITOR:DP-4}

.config/polybar/config-merge/config-merge.sh

@@ -29,5 +29,6 @@ find "$INPUT_DIR" -regextype sed -regex ".*c[0-9]*-.*" -print0 | sort -z |
             touch "$OUTPUT_FILE"
         fi
 
-        cat "$INPUT_DIR/$file" >>"$OUTPUT_FILE"
+        echo "> $file"
+        (cat "$INPUT_DIR/$file"; echo) >> "$OUTPUT_FILE"
     done