X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fsway%2Ffiles%2Fconfig.jinja;h=a60e6eb92b4416ffbf3de6a9dab2cd340e751c92;hb=439691de9a9eb9b87268b7b090b3a2b5c0e9e920;hp=132afc793f0ff552c2e595346d1a3f19b72104de;hpb=feaef29dea8499db16cc2b5cdee0039694a1fab0;p=max%2Fsaltfiles.git

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 132afc7..a60e6eb 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -46,7 +46,7 @@ set $term foot
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
-set $menu dmenu_path | wofi --dmenu | xargs swaymsg exec --
+set $menu rofi -show drun | xargs swaymsg exec --
 
 include /etc/sway/config-vars.d/*
 
@@ -96,6 +96,13 @@ timeout 300 "{{lockcmd}}" \
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 # This keyboard has this layout on all machines:
+input 1267:12356:ELAN1200:00_04F3:3044_Touchpad {
+    tap enabled
+    dwt enabled
+    natural_scroll enabled
+    tap_button_map lrm
+}
+
 input 1241:36:HOLDCHIP_USB_Keyboard {
   xkb_layout us
   xkb_variant colemak
@@ -130,6 +137,13 @@ input 9610:4102:Gaming_KB__Gaming_KB {
   xkb_options ctrl:nocaps
 }
 
+
+input 1133:49948:Logitech_USB_Keyboard {
+  xkb_layout gb
+  xkb_variant colemak
+  xkb_options ctrl:nocaps
+}
+
 ### Key bindings
 #
 # Basics:
@@ -184,16 +198,12 @@ input 9610:4102:Gaming_KB__Gaming_KB {
 #
     # Switch to workspace
     {% for i in range(10) %}
-        bindsym --no-repeat $mod+{{ i }} workspace number {{ i }}; exec "echo 1 > /tmp/sovpipe"
-        bindsym --release $mod+{{ i }} exec "echo 0 > /tmp/sovpipe"
+        bindsym $mod+{{ i }} workspace number {{ i }}
 
         # Move focused container to workspace
         bindsym $mod+Shift+{{ i }} move container to workspace number {{ i }}
     {% endfor %}
 
-    bindsym --no-repeat $mod+Shift exec "echo 1 > /tmp/sovpipe"
-    bindsym --release $mod+Shift exec "echo 0 > /tmp/sovpipe"
-
 #
 # Layout stuff:
 #
@@ -262,9 +272,8 @@ bindsym $mod+Alt+l exec '{{ lockcmd }}'
 include /etc/sway/config.d/*
 # host specific section
 {%- do salt.log.error('sway/files/' + host) -%}
-{% include 'sway/files/' + host %}
 
-exec rm -f /tmp/sovpipe && mkfifo /tmp/sovpipe && tail -f /tmp/sovpipe | sov
+{% include 'sway/files/' + host %}
 
 for_window [app_id="zoom" title="^zoom$"] border none, floating enable
 for_window [app_id="zoom" title="^(Zoom|About)$"] border pixel, floating enable