Move keyboard layout logic into sway config

diff --git a/bash/.profile b/bash/.profile
index f4e15bdf819470d4ccfa15c032d95cd7ee8b37a1..43fbef4ef214c8e7a6d4e208a7ee95a231c3b8a4 100644 (file)
--- a/bash/.profile
+++ b/bash/.profile
@@ -32,18 +32,6 @@ if [ -f ~/.config/termite/config.base ]; then
 fi
 
 
-if [ $HOSTNAME = "magnesium" ]; then
-  export XKB_DEFAULT_LAYOUT=us
-  export XKB_DEFAULT_VARIANT=colemak
-  export XKB_DEFAULT_OPTIONS=ctrl:nocaps
-fi
-
-if [ $HOSTNAME = "platinum" ]; then
-  export XKB_DEFAULT_LAYOUT=gb
-  export XKB_DEFAULT_VARIANT=colemak
-  export XKB_DEFAULT_OPTIONS=ctrl:nocaps
-fi
-
 # make less more friendly for non-text input files, see lesspipe(1)
 if [ -x /usr/bin/lesspipe ]; then 
   export LESSOPEN="|lesspipe %s"

diff --git a/sway/.config/sway/config.magnesium b/sway/.config/sway/config.magnesium
index 3abeacb0611d92eb03358ae4ba8e86cbf740dc47..b23304a8e156b592830928cbf7e595c34a5934d9 100644 (file)
--- a/sway/.config/sway/config.magnesium
+++ b/sway/.config/sway/config.magnesium
@@ -49,5 +49,8 @@ output HDMI-A-3 {
 
 font pango:Liberation Mono 8
 
-exec xhost +si:localuser:spotify
-exec no_glock +si:localuser:spotify
+input 1241:36:HOLDCHIP_USB_Keyboard {
+  xkb_layout us
+  xkb_variant colemak
+  xkb_options ctrl:nocaps
+}

diff --git a/sway/.config/sway/config.platinum b/sway/.config/sway/config.platinum
index d4831c1251ee1d52e5607eca64716c9629a7f7e3..7c79c20aa8212ff78ee675d90feef8edac0c91d1 100644 (file)
--- a/sway/.config/sway/config.platinum
+++ b/sway/.config/sway/config.platinum
@@ -21,3 +21,9 @@ output eDP-1 {
        scale 2
        background ~/Pictures/background.png fit
 }
+
+input * {
+  xkb_layout gb
+  xkb_variant colemak
+  xkb_options ctrl:nocaps
+}