Update/improve locking behaviour

[max/saltfiles.git] / states / sway / files / config.jinja

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 5dac6c7d320094034835f00da6deb3272d3100a8..0ce972f0a12e381b6a8ec1b301dfef825f356511 100644 (file)
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -112,7 +112,7 @@ 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 bemenu-run'
+    bindsym Shift+e exec 'swaymsg mode "default"; swaymsg exec dmenu_run'
 
     bindsym $mod+l exec 'swaymsg mode "default"; "lock.nosmartcard"' 
     bindsym Escape mode "default"
@@ -179,7 +179,10 @@ mode "resize" {
 
 bindsym $mod+p mode "resize"
 
+bindsym XF86MonBrightnessUp exec "brightnessctl set +100"
+bindsym XF86MonBrightnessDown exec "brightnessctl set 100-"
 
+bindsym XF86ScreenSaver exec "lock.nosmartcard"
 
 hide_edge_borders both 
 
@@ -190,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:
@@ -210,6 +212,10 @@ input 16700:8455:DELL_Dell_USB_Entry_Keyboard {
   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 %}