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

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index fe2ec45..735766d 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -50,6 +50,9 @@ set $ws8 "8"
 set $ws9 "9"
 set $ws10 "10"
 
+set $music "Music"
+set $chat "Chat"
+
 mode "$ratpoison" {
 # All/most commands in this mode should revert to the default mode on comleption.
 # We are emulating ratpoison (kinda) here
@@ -68,6 +71,9 @@ mode "$ratpoison" {
     bindsym 8 exec 'swaymsg mode "default"; swaymsg workspace $ws8'
     bindsym 9 exec 'swaymsg mode "default"; swaymsg workspace $ws9'
     bindsym 0 exec 'swaymsg mode "default"; swaymsg workspace $ws10'
+    bindsym m exec 'swaymsg mode "default"; swaymsg workspace $music'
+    bindsym a exec 'swaymsg mode "default"; swaymsg workspace $chat'
+
 
     bindsym Shift+1 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws1'
     bindsym Shift+2 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws2'
@@ -79,6 +85,8 @@ mode "$ratpoison" {
     bindsym Shift+8 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws8'
     bindsym Shift+9 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws9'
     bindsym Shift+0 exec 'swaymsg mode "default"; swaymsg move container to workspace $ws10'
+    bindsym Shift+m exec 'swaymsg mode "default"; swaymsg move container to workspace $music'
+    bindsym Shift+a exec 'swaymsg mode "default"; swaymsg move container to workspace $chat'
 
 # Moving focus
 #    bindsym Tab focus right mode "default"
@@ -104,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"
@@ -171,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 
 
@@ -182,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:
@@ -202,6 +212,16 @@ 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
+}
+
+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 %}