From a751a55fbd66ac6fa909a459b1bf3c1a79930f94 Mon Sep 17 00:00:00 2001
From: David Luevano Alvarado <55825613+luevano@users.noreply.github.com>
Date: Tue, 22 Dec 2020 15:05:49 -0700
Subject: Add new keyboard layout module

---
 .config/polybar/config        | 39 +++++++---------------
 .config/polybar/main.ini      |  2 +-
 .config/polybar/memory.ini    | 71 +++++++++++++++++++++++++++++++++++++++
 .config/polybar/ram.ini       | 71 ---------------------------------------
 .config/polybar/xkeyboard.ini | 78 +++++++++++++++++++++++++++++++++++++++++++
 .config/sxhkd/sxhkdrc         | 12 +++----
 6 files changed, 167 insertions(+), 106 deletions(-)
 create mode 100644 .config/polybar/memory.ini
 delete mode 100644 .config/polybar/ram.ini
 create mode 100644 .config/polybar/xkeyboard.ini

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/memory.ini b/.config/polybar/memory.ini
new file mode 100644
index 0000000..715be96
--- /dev/null
+++ b/.config/polybar/memory.ini
@@ -0,0 +1,71 @@
+[module/memory]
+type = internal/memory
+
+# Seconds to sleep between updates
+# Default: 1
+interval = 2
+
+# Available tags:
+#   <label> (default)
+#   <bar-used>
+#   <bar-free>
+#   <ramp-used>
+#   <ramp-free>
+#   <bar-swap-used>
+#   <bar-swap-free>
+#   <ramp-swap-used>
+#   <ramp-swap-free>
+format-prefix = " "
+format = <label>
+# format-prefix-foreground = ${colors.foreground-alt}
+format-underline = ${colors.cyan}
+
+# Available tokens:
+#   %percentage_used% (default)
+#   %percentage_free%
+#   %gb_used%
+#   %gb_free%
+#   %gb_total%
+#   %mb_used%
+#   %mb_free%
+#   %mb_total%
+#   %percentage_swap_used%
+#   %percentage_swap_free%
+#   %mb_swap_total%
+#   %mb_swap_free%
+#   %mb_swap_used%
+#   %gb_swap_total%
+#   %gb_swap_free%
+#   %gb_swap_used%
+label = %percentage_used:2%%
+
+# Only applies if <bar-used> is used
+bar-used-indicator =
+bar-used-width = 20
+bar-used-foreground-0 = ${colors.green}
+bar-used-foreground-1 = ${colors.green}
+bar-used-foreground-2 = ${colors.yellow}
+bar-used-foreground-3 = ${colors.red}
+bar-used-fill = ▐
+bar-used-empty = ▐
+bar-used-empty-foreground = ${colors.black-alt}
+
+# Only applies if <ramp-used> is used
+ramp-used-0 = ▁
+ramp-used-1 = ▂
+ramp-used-2 = ▃
+ramp-used-3 = ▄
+ramp-used-4 = ▅
+ramp-used-5 = ▆
+ramp-used-6 = ▇
+ramp-used-7 = █
+
+# Only applies if <ramp-free> is used
+ramp-free-0 = ▁
+ramp-free-1 = ▂
+ramp-free-2 = ▃
+ramp-free-3 = ▄
+ramp-free-4 = ▅
+ramp-free-5 = ▆
+ramp-free-6 = ▇
+ramp-free-7 = █
diff --git a/.config/polybar/ram.ini b/.config/polybar/ram.ini
deleted file mode 100644
index 407da7f..0000000
--- a/.config/polybar/ram.ini
+++ /dev/null
@@ -1,71 +0,0 @@
-[module/ram]
-type = internal/memory
-
-# Seconds to sleep between updates
-# Default: 1
-interval = 2
-
-# Available tags:
-#   <label> (default)
-#   <bar-used>
-#   <bar-free>
-#   <ramp-used>
-#   <ramp-free>
-#   <bar-swap-used>
-#   <bar-swap-free>
-#   <ramp-swap-used>
-#   <ramp-swap-free>
-format-prefix = " "
-format = <label>
-# format-prefix-foreground = ${colors.foreground-alt}
-format-underline = ${colors.cyan}
-
-# Available tokens:
-#   %percentage_used% (default)
-#   %percentage_free%
-#   %gb_used%
-#   %gb_free%
-#   %gb_total%
-#   %mb_used%
-#   %mb_free%
-#   %mb_total%
-#   %percentage_swap_used%
-#   %percentage_swap_free%
-#   %mb_swap_total%
-#   %mb_swap_free%
-#   %mb_swap_used%
-#   %gb_swap_total%
-#   %gb_swap_free%
-#   %gb_swap_used%
-label = %percentage_used:2%%
-
-# Only applies if <bar-used> is used
-bar-used-indicator =
-bar-used-width = 20
-bar-used-foreground-0 = ${colors.green}
-bar-used-foreground-1 = ${colors.green}
-bar-used-foreground-2 = ${colors.yellow}
-bar-used-foreground-3 = ${colors.red}
-bar-used-fill = ▐
-bar-used-empty = ▐
-bar-used-empty-foreground = ${colors.black-alt}
-
-# Only applies if <ramp-used> is used
-ramp-used-0 = ▁
-ramp-used-1 = ▂
-ramp-used-2 = ▃
-ramp-used-3 = ▄
-ramp-used-4 = ▅
-ramp-used-5 = ▆
-ramp-used-6 = ▇
-ramp-used-7 = █
-
-# Only applies if <ramp-free> is used
-ramp-free-0 = ▁
-ramp-free-1 = ▂
-ramp-free-2 = ▃
-ramp-free-3 = ▄
-ramp-free-4 = ▅
-ramp-free-5 = ▆
-ramp-free-6 = ▇
-ramp-free-7 = █
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.
 #
-- 
cgit v1.2.3-54-g00ecf