X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fsway%2Ffiles%2Fconfig.jinja;h=86b9e213cd569e1ef9cf1aeb1dd4ad9454cd8f92;hb=4a8e05141e7f2b89a6e9382430fa93f61abeba47;hp=af3a8b29afc67e5c4e2155840efe24f4fb4405bf;hpb=80e1f8e8e39c5de5b5312ba159909df1e7ff3088;p=max%2Fsaltfiles.git diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja index af3a8b2..86b9e21 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" } @@ -183,10 +183,17 @@ 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 +} # host specific section {%- do salt.log.error('sway/files/' + host) -%}