From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 28 May 2019 15:43:58 +0000 (+0100)
Subject: Move keyboard layout logic into sway config
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=b93d71335f47520c53b07352dbc8b6e4a8b57f36;hp=49900f2cb8f5fcbb24ead38c6095ac6ff09b54c0;p=max%2Fdotfiles.git

Move keyboard layout logic into sway config
---

diff --git a/bash/.profile b/bash/.profile
index f4e15bd..43fbef4 100644
--- 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 3abeacb..b23304a 100644
--- 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 d4831c1..7c79c20 100644
--- 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
+}