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

diff --combined states/sway/files/config.jinja
index a7efde350776dd4cef6e82b4d3d4e2fbfdb09e8a,4969a036a2e55db45579bd6c453acd215e77cd03..4b7931ee2fd5a26c1ec6dd496ec3f531101d9b92
--- 1/states/sway/files/config.jinja
--- 2/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@@ -50,6 -50,9 +50,9 @@@ set $ws8 "8
  set $ws9 "9"
  set $ws10 "10"
  
+ set $music "Music"
+ set $chat "Chat"
+ 
  mode "$ratpoison" {
  # All/most commands in this mode should revert to the default mode on comleption.
  # We are emulating ratpoison (kinda) here
@@@ -68,6 -71,9 +71,9 @@@
      bindsym 8 exec 'swaymsg mode "default"; swaymsg workspace $ws8'
      bindsym 9 exec 'swaymsg mode "default"; swaymsg workspace $ws9'
      bindsym 0 exec 'swaymsg mode "default"; swaymsg workspace $ws10'
+     bindsym m exec 'swaymsg mode "default"; swaymsg workspace $music'
+     bindsym a exec 'swaymsg mode "default"; swaymsg workspace $chat'
+ 
  
      bindsym Shift+1 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws1'
      bindsym Shift+2 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws2'
@@@ -79,6 -85,8 +85,8 @@@
      bindsym Shift+8 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws8'
      bindsym Shift+9 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws9'
      bindsym Shift+0 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws10'
+     bindsym Shift+m exec 'swaymsg mode "default"; swaymsg move container to workspace $music'
+     bindsym Shift+a exec 'swaymsg mode "default"; swaymsg move container to workspace $chat'
  
  # Moving focus
  #    bindsym Tab focus right mode "default"
@@@ -171,8 -179,7 +179,8 @@@ mode "resize" 
  
  bindsym $mod+p mode "resize"
  
 -
 +bindsym XF86MonBrightnessUp exec "brightnessctl set +100"
 +bindsym XF86MonBrightnessDown exec "brightnessctl set 100-"
  
  hide_edge_borders both 
  
@@@ -183,12 -190,30 +191,30 @@@ focus_on_window_activation urgen
  for_window [class="^rdesktop"] move workspace number 9; floating disable
  for_window [class="Pinentry"] floating enable
  
+ {% set lockcmd = "swaylock -i {DP-1,eDP-1,HDMI-A-1}:~/Pictures/lockscreen_1080_1.png" %}
+ 
  exec swayidle \
-   timeout 300 "lock.nosmartcard" \
+ timeout 300 "{{lockcmd}}" \
    timeout 600 'swaymsg "output * dpms off"' \
-     resume 'swaymsg "output * dpms on" \
-   before-sleep "lock.nosmartcard"
+     resume 'swaymsg "output * dpms on"' \
+     before-sleep "{{lockcmd}}"
+ 
+ # This keyboard has this layout on all machines:
+ input 1241:36:HOLDCHIP_USB_Keyboard {
+   xkb_layout us
+   xkb_variant colemak
+   xkb_options ctrl:nocaps
+ }
  
+ input 16700:8455:DELL_Dell_USB_Entry_Keyboard {
+   xkb_layout gb
+   xkb_variant colemak
+   xkb_options ctrl:nocaps
+ }
+ 
+ input 7504:24616:unspecified_ErgoDox_ergonomic_keyboard {
+   xkb_layout gb
+ }
  # host specific section
  {%- do salt.log.error('sway/files/' + host) -%}
  {% include 'sway/files/' + host %}