Merge branch 'master' of git.friedersdorff.com:max/saltfiles

diff --cc states/sway/files/config.jinja
index 735766dd7dc9314e9ca393c702b9cdfa981ef9e3,3bd88e8c97ccbd1af734a4f710dd5c6f694a770f..96cf5522dbbcd6c762558956b33741fffa15247b
--- 1/states/sway/files/config.jinja
--- 2/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@@ -217,11 -217,12 +217,18 @@@ input 7504:24616:unspecified_ErgoDox_er
    xkb_layout gb
  }
  
 +input 9494:21:CM_Storm_Quickfire_Pro_Ultimate_6_key {
 +  xkb_layout gb
 +  xkb_variant colemak
 +  xkb_options ctrl:nocaps
 +}
++
+ input 1:1:AT_Translated_Set_2_keyboard {
+   xkb_layout gb
+   xkb_variant colemak
+   xkb_options ctrl:nocaps
+ }
+ 
  # host specific section
  {%- do salt.log.error('sway/files/' + host) -%}
  {% include 'sway/files/' + host %}