X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fsway%2Ffiles%2Fconfig.jinja;h=735766dd7dc9314e9ca393c702b9cdfa981ef9e3;hb=61bf6d4c92ff54a2b381e2c8617af8cfcc70f4b5;hp=c05fb15ee5bfdc47baaa5523d1d1e74521aa39f4;hpb=e7abfd09c6bab2e07b75ff1f89fa1647c39a311e;p=max%2Fsaltfiles.git

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index c05fb15..735766d 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -193,12 +193,11 @@ 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" %}
+{% set lockcmd = "swaylock -e -f -i ~/Pictures/lockscreen_1080_1.png" %}
 
-exec swayidle \
+exec swayidle -w \
 timeout 300 "{{lockcmd}}" \
-  timeout 600 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on"' \
+  timeout 600 'systemctl suspend' \
     before-sleep "{{lockcmd}}"
 
 # This keyboard has this layout on all machines:
@@ -217,6 +216,12 @@ input 16700:8455:DELL_Dell_USB_Entry_Keyboard {
 input 7504:24616:unspecified_ErgoDox_ergonomic_keyboard {
   xkb_layout gb
 }
+
+input 9494:21:CM_Storm_Quickfire_Pro_Ultimate_6_key {
+  xkb_layout gb
+  xkb_variant colemak
+  xkb_options ctrl:nocaps
+}
 # host specific section
 {%- do salt.log.error('sway/files/' + host) -%}
 {% include 'sway/files/' + host %}