X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fsway%2Ffiles%2Fconfig.jinja;h=0d59a3311c0ef2f7df15a26bcd03e8f4415efef9;hb=9de0bf335c71d4d5afe2764aaa8dcf048b5718ba;hp=c5b6eb19f2ebf6c29e4517813c79ffa21e294e1e;hpb=1f948754049cd185fad329d16ab26050a7070d49;p=max%2Fsaltfiles.git

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index c5b6eb1..0d59a33 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -104,9 +104,9 @@ mode "$ratpoison" {
     bindsym c exec 'swaymsg mode "default"; swaymsg exec termite'
     bindsym q exec 'swaymsg mode "default"; swaymsg kill'
 
-    bindsym Shift+e exec 'swaymsg mode "default"; swaymsg exec dmenu_run'
+    bindsym Shift+e exec 'swaymsg mode "default"; swaymsg exec bemenu-run'
 
-    bindsym $mod+l exec 'swaymsg mode "default"; "lock.{{ host }}"' 
+    bindsym $mod+l exec 'swaymsg mode "default"; "lock.nosmartcard"' 
     bindsym Escape mode "default"
 }
 
@@ -183,11 +183,23 @@ for_window [class="^rdesktop"] move workspace number 9; floating disable
 for_window [class="Pinentry"] floating enable
 
 exec swayidle \
-  timeout 300 "lock.{{ host }}" \
+  timeout 300 "lock.nosmartcard" \
   timeout 600 'swaymsg "output * dpms off"' \
     resume 'swaymsg "output * dpms on" \
-  before-sleep "lock.{{ host }}"
+  before-sleep "lock.nosmartcard"
 
+# 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
+}
 # host specific section
 {%- do salt.log.error('sway/files/' + host) -%}
 {% include 'sway/files/' + host %}