X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fsway%2Ffiles%2Fconfig.jinja;h=fe2ec45defae3c4856dee9bba76587661c1fc125;hb=1b6d204140353b691db1009b7681067f99d64048;hp=af3a8b29afc67e5c4e2155840efe24f4fb4405bf;hpb=80e1f8e8e39c5de5b5312ba159909df1e7ff3088;p=max%2Fsaltfiles.git

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index af3a8b2..fe2ec45 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -106,7 +106,7 @@ mode "$ratpoison" {
 
     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"
 }
 
@@ -182,12 +182,26 @@ focus_on_window_activation urgent
 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.{{ host }}" \
+timeout 300 "{{lockcmd}}" \
   timeout 600 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on" \
-  before-sleep "lock.{{ host }}"
+    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
+}
 # host specific section
 {%- do salt.log.error('sway/files/' + host) -%}
 {% include 'sway/files/' + host %}