Polish Polybar up, re-adding the spacing at the edges and adding a new keylock indicator

desktop-gruvbox/.config/polybar/config

@@ -50,9 +50,10 @@ foreground = ${res/colors.fg}
 border-color = ${res/colors.border}
 tray-background = ${res/colors.bg}
 height = 40
-width = 100%
+width = 100%:-12
+offset-x = 6
 padding = 2
-border-bottom-size = ${res/config.border-size}
+border-size = ${res/config.border-size}
 font-0 = "IBM Plex Sans:style=Medium:size=10;2"
 font-1 = "Deja Vu Sans Mono:style=Regular:size=10;2"
 font-2 = "IBM Plex Sans:style=Bold:size=10;2"
@@ -65,13 +66,15 @@ monitor = ${env:PB_MONITOR:eDP-1}
 inherit = template/bar
 tray-position = center
 modules-left = i3 bspwm service-ansible service-backup reboot-required
-modules-right = backlight pulse battery | date
+modules-right = xkeyboard backlight pulse battery | date
+border-top-size = 0
 
 [bar/secondary]
 monitor= ${env:PB_MONITOR:HDMI-A-0}
 inherit = template/bar
 modules-left = i3 bspwm
-modules-right = pulse wlan-desktop-stats mpd | date
+modules-right = xkeyboard pulse wlan-desktop-stats mpd | date
+border-top-size = 0
 
 ## MODULES
 [module/|]
@@ -291,8 +294,17 @@ label-connected = U %upspeed% D %downspeed%
 
 [module/xkeyboard]
 type = internal/xkeyboard
-format = <label-layout>
-label-layout = %name%
+format = <label-indicator>
+label-indicator-on = %icon%
+label-indicator-off = %icon%
+label-indicator-on-capslock = 
+label-indicator-on-capslock-padding = 4
+label-indicator-on-capslock-background = ${res/colors.yellow}
+label-indicator-on-capslock-foreground = ${res/colors.black}
+label-indicator-off-numlock = 
+label-indicator-off-numlock-padding = 4
+label-indicator-off-numlock-background = ${res/colors.yellow}
+label-indicator-off-numlock-foreground = ${res/colors.black}
 
 [module/xwindow]
 type = internal/xwindow