X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fsway%2Ffiles%2Fconfig.jinja;h=ab4019e6a8d79f8c06f410781b57909800df7bf6;hb=380c2791e2b37cc5003acc8825aea8dc3a710aa5;hp=4b7931ee2fd5a26c1ec6dd496ec3f531101d9b92;hpb=17631753b72bafef13e96a690e5110af9d611770;p=max%2Fsaltfiles.git

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 4b7931e..ab4019e 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -30,9 +30,8 @@ client.focused_inactive $black $black_super $white $black $black
 
 set $mod Mod4
 
-# Slight gaps between windows
-gaps inner 5
-gaps outer 5
+# Slight gaps around windows
+gaps inner 6
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -112,7 +111,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"
@@ -182,6 +181,8 @@ 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 
 
 focus_follows_mouse no
@@ -191,12 +192,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:
@@ -215,6 +215,19 @@ 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
+}
+
+input 1:1:AT_Translated_Set_2_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 %}