Add new keyboard layout module

5 files changed, 97 insertions, 36 deletions

diff --git a/.config/polybar/config b/.config/polybar/config
index b0214b7..d41ed3e 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -12,37 +12,22 @@ margin-top = 24
 margin-bottom = 0
 
 # Include colors.
-include-file = /home/lz/.config/polybar/colors.ini
+include-file = $XDG_CONFIG_HOME/polybar/colors.ini
 
 # 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-file = $XDG_CONFIG_HOME/polybar/common.ini
+include-file = $XDG_CONFIG_HOME/polybar/main.ini
+include-file = $XDG_CONFIG_HOME/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
-include-file = /home/lz/.config/polybar/date.ini
-include-file = /home/lz/.config/polybar/powermenu.ini
-include-file = /home/lz/.config/polybar/cpu.ini
-include-file = /home/lz/.config/polybar/ram.ini
-
-# [module/xkeyboard]
-# type = internal/xkeyboard
-# blacklist-0 = num lock
-
-# format-prefix = " "
-# format-prefix-foreground = ${colors.foreground-alt}
-# format-prefix-underline = ${colors.cyan}
-
-# label-layout = %layout%
-# label-layout-underline = ${colors.cyan}
-
-# label-indicator-padding = 2
-# label-indicator-margin = 1
-# label-indicator-background = ${colors.cyan}
-# label-indicator-underline = ${colors.cyan}
+include-file = $XDG_CONFIG_HOME/polybar/bspwm.ini
+include-file = $XDG_CONFIG_HOME/polybar/xwindow.ini
+include-file = $XDG_CONFIG_HOME/polybar/pulseaudio.ini
+include-file = $XDG_CONFIG_HOME/polybar/date.ini
+include-file = $XDG_CONFIG_HOME/polybar/powermenu.ini
+include-file = $XDG_CONFIG_HOME/polybar/cpu.ini
+include-file = $XDG_CONFIG_HOME/polybar/memory.ini
+include-file = $XDG_CONFIG_HOME/polybar/xkeyboard.ini
 
 # [module/filesystem]
 # type = internal/fs
diff --git a/.config/polybar/main.ini b/.config/polybar/main.ini
index 66a9342..0b681dd 100644
--- a/.config/polybar/main.ini
+++ b/.config/polybar/main.ini
@@ -4,7 +4,7 @@ monitor = ${env:MAINMON:HDMI-0}
 
 modules-left=bspwm
 modules-center=xwindow
-modules-right=cpu ram pulseaudio date powermenu
+modules-right=xkeyboard cpu memory pulseaudio date powermenu
 
 tray-position = right
 tray-padding = 2
diff --git a/.config/polybar/ram.ini b/.config/polybar/memory.ini
index 407da7f..715be96 100644
--- a/.config/polybar/ram.ini
+++ b/.config/polybar/memory.ini
@@ -1,4 +1,4 @@
-[module/ram]
+[module/memory]
 type = internal/memory
 
 # Seconds to sleep between updates
diff --git a/.config/polybar/xkeyboard.ini b/.config/polybar/xkeyboard.ini
new file mode 100644
index 0000000..f1de6f6
--- /dev/null
+++ b/.config/polybar/xkeyboard.ini
@@ -0,0 +1,78 @@
+[module/xkeyboard]
+type = internal/xkeyboard
+
+# List of indicators to ignore
+blacklist-0 = scroll lock
+# blacklist-1 = num lock
+
+# Available tags:
+#   <label-layout> (default)
+#   <label-indicator> (default)
+format-prefix = " "
+format = <label-layout> <label-indicator>
+format-spacing = 0
+# format-prefix-foreground = ${colors.foreground-alt}
+# format-prefix-underline = ${colors.cyan}
+format-underline = ${colors.red}
+
+# Available tokens:
+#   %layout%
+#   %name%
+#   %number%
+#   %icon%
+#   %variant% (unreleased)
+# Default: %layout%
+label-layout = %icon% (%layout%)
+label-layout-padding = 0
+# label-layout-background = #bc99ed
+# label-layout-foreground = #000
+# label-layout-underline = ${colors.cyan}
+
+# layout-icon-[0-9]+ = layout;icon
+# Assign each layout an icon that will be available as %icon% token for the
+# <label-layout> tag. The part before ';' will try to match %layout% value.
+layout-icon-default = some-icon
+layout-icon-0 = latam;ES
+layout-icon-1 = us;EN
+
+# indicator-icon-[0-9]+ = indicator;off icon;on icon
+# Provides the content of the %icon% token in label-indicator-*
+indicator-icon-default = D
+indicator-icon-0 = caps lock;-CL;+CL
+indicator-icon-1 = scroll lock;-SL;+SL
+indicator-icon-2 = num lock;-NL;+NL
+
+# Available tokens:
+#   %name%
+# Default: %name%
+# @deprecated, use label-indicator-on
+# label-indicator = %name%
+
+# Replaces label-indicator
+# Available tokens:
+#   %name%
+#   %icon%
+# Default: %name%
+label-indicator-on = %icon%
+
+# Available tokens:
+#   %name%
+#   %icon%
+# Default: (none)
+label-indicator-off = %icon%
+
+# Replaces label-indicator-* if for specific indicators
+# Available tokens:
+#   %name%
+#   %icon%
+# label-indicator-on-capslock = C
+# label-indicator-off-capslock = C
+# label-indicator-on-numlock = N
+# label-indicator-off-numlock = N
+# label-indicator-on-scrolllock = S
+# label-indicator-off-scrolllock = S
+
+# label-indicator-padding = 1
+# label-indicator-margin = 1
+# label-indicator-background = ${colors.cyan}
+# label-indicator-underline = ${colors.cyan}
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index 77b3671..daef45c 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -11,9 +11,12 @@ super + @d
 	dmenu_run -fn "Noto Sans Mono:size=12" -nb "$(xresource background)" -nf "$(xresource foreground)" -sb "$(xresource color4)" -sf "$(xresource color0)"
 super + Escape
 	pkill -USR1 -x sxhkd
+# Inside polybar_panel, it actually kills it and then starts it again.
 super + shift + Escape
-	pkill -x statusbar\
-	statusbar
+	polybar_panel
+# Change keyboard layout.
+super + space
+	setxkbmap -option grp:win_space_toggle latam,us
 
 # Run programs.
 super + shift + w
@@ -27,11 +30,6 @@ super + Delete
 {_,super + , super + shift + } Print
 	$SSMGR {gui,full -c,full -p $SSPATH}
 
-# Reload polybar(s).
-# Inside polybar_panel, it actually kills it and then starts it again.
-super + shift + p
-	polybar_panel
-
 #
 # bspwm keybindings.
 #