From d3b03472ae3107e09e117def65c739aa9aaf00bf Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 3 Oct 2022 11:38:40 +0100
Subject: [PATCH 01/16] Some more configuration

---
 states/conky/files/conkyrc     |  2 +-
 states/sway/files/config.jinja | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index ede13d7..dc051ab 100644
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -11,7 +11,7 @@
 {% elif grains['host'] == 'rhenium' %}
 	{% set ifdev = ['wlp2s0'] %}
 {% elif grains['host'] == 'baryte' %}
-	{% set ifdev = ['enx00f001e00121'] %}
+	{% set ifdev = ['enp0s20f0u4u2c2'] %}
 {% else %}
 	{% set ifdev = ['eth0'] %}
 {% endif %}
diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 6a3a8e0..ac0da0f 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -74,6 +74,14 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
 
+{% set lockcmd = "swaylock -e -f -i ~/Pictures/Backgrounds/DSC02113.jpg" %}
+
+exec swayidle -w \
+timeout 300 "{{lockcmd}}" \
+  timeout 600 'systemctl suspend' \
+    before-sleep "{{lockcmd}}"
+
+
 ### Input configuration
 #
 # Example configuration:
@@ -260,6 +268,8 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
+bindsym $mod+Alt+l exec '{{ lockcmd }}'
+
 
 include /etc/sway/config.d/*
 # host specific section
-- 
2.46.2


From 52b50c2ba37d2c7d56929a728c27e684f823decd Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 3 Oct 2022 12:06:13 +0100
Subject: [PATCH 02/16] Install bitwarden cli

---
 states/qutebrowser/arch.sls | 1 +
 states/setup-arch.sls       | 2 +-
 states/vim/arch.sls         | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/states/qutebrowser/arch.sls b/states/qutebrowser/arch.sls
index 487049c..35cb589 100644
--- a/states/qutebrowser/arch.sls
+++ b/states/qutebrowser/arch.sls
@@ -5,3 +5,4 @@ install qutebrowser:
       - qt5-wayland
       - python-tldextract
       - wofi
+      - bitwarden-cli
diff --git a/states/setup-arch.sls b/states/setup-arch.sls
index 9921620..b2579ac 100644
--- a/states/setup-arch.sls
+++ b/states/setup-arch.sls
@@ -13,6 +13,6 @@ archmirror:
     - name: /etc/pacman.d/archmirror
     - user: root
     - group: root
-    - mode: 640
+    - mode: 644
     - contents:
       - "Server = https://pkg-cache.friedersdorff.com/archlinux/$repo/os/$arch"
diff --git a/states/vim/arch.sls b/states/vim/arch.sls
index 21d31ee..dd47c29 100644
--- a/states/vim/arch.sls
+++ b/states/vim/arch.sls
@@ -3,7 +3,6 @@ install vim:
     - pkgs:
       - gvim
       - powerline
-      - powerline-fonts-git
       - ctags
       - python-pylint
       - flake8
-- 
2.46.2


From 65c989ce4e5c9a40e85795bfe4c784ef189791a2 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 3 Oct 2022 16:57:31 +0100
Subject: [PATCH 03/16] Configure all the things

---
 states/setup-arch.sls                 |  2 ++
 states/sway/arch.sls                  |  1 +
 states/sway/files/baryte              |  2 ++
 states/sway/files/config.jinja        | 36 ++++++++++-----------------
 states/sway/files/monitor_switch_sway | 25 +++++++++++++++++++
 states/sway/init.sls                  | 11 ++++++++
 6 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100644 states/sway/files/monitor_switch_sway

diff --git a/states/setup-arch.sls b/states/setup-arch.sls
index b2579ac..fda05dd 100644
--- a/states/setup-arch.sls
+++ b/states/setup-arch.sls
@@ -7,6 +7,8 @@ install pulseaudio:
       - pulseaudio
       - git
       - man-db
+      - vifm
+      - devtools
 
 archmirror:
   file.managed:
diff --git a/states/sway/arch.sls b/states/sway/arch.sls
index e3a00fd..44936af 100644
--- a/states/sway/arch.sls
+++ b/states/sway/arch.sls
@@ -9,6 +9,7 @@ install sway:
       - mako
       - libnotify
       - dmenu
+      - sov
 
 ensure dmenu-wl wrapper:
   file.managed:
diff --git a/states/sway/files/baryte b/states/sway/files/baryte
index c5bc4d5..e2f7bc0 100644
--- a/states/sway/files/baryte
+++ b/states/sway/files/baryte
@@ -76,3 +76,5 @@ workspace 1 output DP-3
 workspace 3 output DP-3
 
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+exec mako&
+exec ~/.local/bin/monitor_switch_sway&
diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index ac0da0f..30724ae 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -183,29 +183,17 @@ input 9610:4102:Gaming_KB__Gaming_KB {
 # Workspaces:
 #
     # Switch to workspace
-    bindsym $mod+1 workspace number 1
-    bindsym $mod+2 workspace number 2
-    bindsym $mod+3 workspace number 3
-    bindsym $mod+4 workspace number 4
-    bindsym $mod+5 workspace number 5
-    bindsym $mod+6 workspace number 6
-    bindsym $mod+7 workspace number 7
-    bindsym $mod+8 workspace number 8
-    bindsym $mod+9 workspace number 9
-    bindsym $mod+0 workspace number 10
-    # Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace number 1
-    bindsym $mod+Shift+2 move container to workspace number 2
-    bindsym $mod+Shift+3 move container to workspace number 3
-    bindsym $mod+Shift+4 move container to workspace number 4
-    bindsym $mod+Shift+5 move container to workspace number 5
-    bindsym $mod+Shift+6 move container to workspace number 6
-    bindsym $mod+Shift+7 move container to workspace number 7
-    bindsym $mod+Shift+8 move container to workspace number 8
-    bindsym $mod+Shift+9 move container to workspace number 9
-    bindsym $mod+Shift+0 move container to workspace number 10
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
+    {% 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"
+
+        # 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:
 #
@@ -275,3 +263,5 @@ 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
diff --git a/states/sway/files/monitor_switch_sway b/states/sway/files/monitor_switch_sway
new file mode 100644
index 0000000..6e198fc
--- /dev/null
+++ b/states/sway/files/monitor_switch_sway
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+{% if grains['host'] == 'baryte' %}
+{% set ext = "DP-3" %}
+{% else %}
+{% set ext = "DP-1" %}
+{% endif %}
+
+FILE="/proc/acpi/button/lid/LID*/state"
+last=-1
+while true; do
+        grep -q open ${FILE}
+        current="$?"
+        if [ $last -ne $current ]; then
+                if [ $current -eq 0 ]; then
+                        swaymsg output {{ ext }} disable
+                        swaymsg output eDP-1 enable
+                else
+                        swaymsg output eDP-1 disable
+                        swaymsg output {{ ext }} enable
+                fi
+        fi
+        last=$current
+        sleep 0.5
+done
diff --git a/states/sway/init.sls b/states/sway/init.sls
index a134528..8d5c3e5 100644
--- a/states/sway/init.sls
+++ b/states/sway/init.sls
@@ -37,3 +37,14 @@ conky launch script:
     - user: {{ grains['user'] }}
     - group: {{ grains['user'] }}
     - mode: 750
+
+{% if grains['host'] in ['baryte', 'barium', 'rhenium'] %}
+monitor switch script:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.local/bin/monitor_switch_sway
+    - source: salt://sway/files/monitor_switch_sway
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - mode: 750
+    - template: jinja
+{% endif %}
-- 
2.46.2


From cc380a1eeb2fd611cfb96574b44dd00e2e168b92 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 4 Oct 2022 10:25:17 +0100
Subject: [PATCH 04/16] Configure some moar

---
 states/sway/files/baryte      |  2 +-
 states/sway/files/mako_config |  4 ++++
 states/sway/init.sls          | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 states/sway/files/mako_config

diff --git a/states/sway/files/baryte b/states/sway/files/baryte
index e2f7bc0..6503657 100644
--- a/states/sway/files/baryte
+++ b/states/sway/files/baryte
@@ -66,7 +66,7 @@ output DP-3 {
 output HDMI-A-1 {
   background ~/Pictures/Backgrounds/DSC02121.jpg fill
   position 2560 0
-  scale 1.5
+  scale 1
 }
 
 
diff --git a/states/sway/files/mako_config b/states/sway/files/mako_config
new file mode 100644
index 0000000..367e779
--- /dev/null
+++ b/states/sway/files/mako_config
@@ -0,0 +1,4 @@
+height=300
+sort=+time
+font=monospace 12
+default-timeout=15000
diff --git a/states/sway/init.sls b/states/sway/init.sls
index 8d5c3e5..a0dc71b 100644
--- a/states/sway/init.sls
+++ b/states/sway/init.sls
@@ -48,3 +48,20 @@ monitor switch script:
     - mode: 750
     - template: jinja
 {% endif %}
+
+mako config dir:
+  file.directory:
+    - name: {{ grains['homedir'] }}/.config/mako
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - dir_mode: 750
+    - makedirs: True
+
+mako config:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.config/mako/config
+    - source: salt://sway/files/mako_config
+    - template: jinja
+    - user: {{ grains['user']}}
+    - group: {{ grains['user']}}
+    - mode: 640
-- 
2.46.2


From 2f965b85dece6a0dbe93ed70d2b2f63acdd74774 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 4 Oct 2022 10:26:55 +0100
Subject: [PATCH 05/16] Show teatimer log on baryte

---
 states/conky/files/conkyrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index dc051ab..4f3252c 100644
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -37,8 +37,8 @@ conky.text = [[
   ${if_match "${exec cat ~/.local/share/pomodoro}"!="done"}
     {"full_text": "Pomodoro: ${exec cat ~/.local/share/pomodoro}", "color": "\#ea0501"},
   ${endif}
-{% if grains['host'] == 'barium' %}
-  {"full_text": "Tea: ${execi 120 tail -n 1 ~/.local/share/teatimer.log}s", "color": "\#ffffff"},
+{% if grains['host'] in ['barium', 'baryte'] %}
+  {"full_text": "Tea: ${execi 60 tail -n 1 ~/.local/share/teatimer.log}s", "color": "\#ffffff"},
 {% endif %}
   {"full_text": "~ ${fs_free /home}", "color": "\#ffffff"},
   {"full_text": "/ ${fs_free /root}", "color": "\#ffffff"},
-- 
2.46.2


From eef0778d94d015dd79602c7f39e8e7401bfe6a52 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 4 Oct 2022 10:50:22 +0100
Subject: [PATCH 06/16] Set DOCKER_HOST

---
 states/zsh/files/zshenv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/states/zsh/files/zshenv b/states/zsh/files/zshenv
index dd69c65..8e1518c 100644
--- a/states/zsh/files/zshenv
+++ b/states/zsh/files/zshenv
@@ -29,3 +29,5 @@ eval $(dircolors ~/.dir_colors)
 export GPG_TTY=$(tty)
 
 export _JAVA_AWT_WM_NONREPARENTING=1
+
+export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock
-- 
2.46.2


From 38399cbbfb9c15074eadf396ca9586765ec65852 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 4 Oct 2022 11:17:15 +0100
Subject: [PATCH 07/16] More config changes

---
 states/qutebrowser/files/config.py | 2 +-
 states/sway/files/mako_config      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/states/qutebrowser/files/config.py b/states/qutebrowser/files/config.py
index c799e12..55fbb2c 100644
--- a/states/qutebrowser/files/config.py
+++ b/states/qutebrowser/files/config.py
@@ -3,7 +3,7 @@ config.load_autoconfig()
 c.auto_save.session = True
 c.content.cookies.accept = 'no-3rdparty'
 c.content.images = True
-c.editor.command = ['termite', '-e', 'vim {file}']
+c.editor.command = ['foot', 'vim',  '{file}']
 c.tabs.position = 'left'
 c.url.searchengines = {'DEFAULT': 'https://duckduckgo.com/?q={}'}
 c.messages.timeout = 5000
diff --git a/states/sway/files/mako_config b/states/sway/files/mako_config
index 367e779..710d2da 100644
--- a/states/sway/files/mako_config
+++ b/states/sway/files/mako_config
@@ -1,4 +1,4 @@
 height=300
 sort=+time
 font=monospace 12
-default-timeout=15000
+default-timeout=20000
-- 
2.46.2


From feaef29dea8499db16cc2b5cdee0039694a1fab0 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 4 Oct 2022 14:35:12 +0100
Subject: [PATCH 08/16] configure for zoom a little

---
 states/sway/files/config.jinja | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 30724ae..132afc7 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -265,3 +265,8 @@ include /etc/sway/config.d/*
 {% include 'sway/files/' + host %}
 
 exec rm -f /tmp/sovpipe && mkfifo /tmp/sovpipe && tail -f /tmp/sovpipe | sov
+
+for_window [app_id="zoom" title="^zoom$"] border none, floating enable
+for_window [app_id="zoom" title="^(Zoom|About)$"] border pixel, floating enable
+for_window [app_id="zoom" title="Settings"] floating enable, floating_minimum_size 960 x 700
+for_window [app_id="zoom" title="Zoom Meeting(.*)?"] floating disable, inhibit_idle open
-- 
2.46.2


From c83a2b0fed03a506d8148d36d0ad36444c9b3315 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 11 Oct 2022 09:12:53 +0100
Subject: [PATCH 09/16] Add keyboard layout

---
 states/sway/files/config.jinja | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 132afc7..8758db8 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -130,6 +130,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:
-- 
2.46.2


From 6349a7075431ab971686f9bc79f3e70acd7d3cb7 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 11 Oct 2022 09:13:07 +0100
Subject: [PATCH 10/16] Don't ff merges

---
 states/git/init.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/states/git/init.sls b/states/git/init.sls
index f4a119a..2bfd1ca 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -14,7 +14,7 @@ include:
   'core.editor': 'vim',
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
-  'merge.ff': 'true',
+  'merge.ff': 'false',
   'pull.rebase': 'false',
   'push.default': 'simple',
   'alias.lg': 'log --graph --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
-- 
2.46.2


From e454d984f40d5e96b43f55520327f6e196db2cd9 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 11 Oct 2022 09:57:51 +0100
Subject: [PATCH 11/16] Set dmenu command for pass scripts

---
 states/qutebrowser/files/config.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/states/qutebrowser/files/config.py b/states/qutebrowser/files/config.py
index 55fbb2c..50900b1 100644
--- a/states/qutebrowser/files/config.py
+++ b/states/qutebrowser/files/config.py
@@ -26,15 +26,15 @@ c.content.headers.user_agent = 'Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/2
 c.content.headers.custom = {'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'}
 {% endif %}
 
-config.bind(',zl', "spawn --userscript qute-pass --dmenu-invocation 'rofi -dmenu'")
-config.bind(',zul', "spawn --userscript qute-pass --dmenu-invocation 'rofi -dmenu' --username-only")
-config.bind(',zpl', "spawn --userscript qute-pass --dmenu-invocation 'rofi -dmenu' --password-only")
-config.bind(',zol', "spawn --userscript qute-pass --dmenu-invocation 'rofi -dmenu' --otp-only")
-
-config.bind(',bl', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation dmenu')
-config.bind(',bul', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation dmenu --username-only')
-config.bind(',bpl', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation dmenu --password-only')
-config.bind(',bol', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation dmenu --totp-only')
+config.bind(',zl', "spawn --userscript qute-pass --dmenu-invocation 'wofi --dmenu'")
+config.bind(',zul', "spawn --userscript qute-pass --dmenu-invocation 'wofi --dmenu' --username-only")
+config.bind(',zpl', "spawn --userscript qute-pass --dmenu-invocation 'wofi --dmenu' --password-only")
+config.bind(',zol', "spawn --userscript qute-pass --dmenu-invocation 'wofi --dmenu' --otp-only")
+
+config.bind(',bl', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation wofi --dmenu')
+config.bind(',bul', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation wofi --dmenu --username-only')
+config.bind(',bpl', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation wofi --dmenu --password-only')
+config.bind(',bol', 'spawn --userscript qute-bitwarden --auto-lock 14400 --dmenu-invocation wofi --dmenu --totp-only')
 
 
 
-- 
2.46.2


From 95263bf9bc976ede0db6c8fd1b3d3ce4c79bcebd Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 12 Oct 2022 16:23:06 +0100
Subject: [PATCH 12/16] Buncha changes

---
 states/git/init.sls        | 3 ++-
 states/tmux/files/wm_copy  | 2 +-
 states/tmux/files/wm_paste | 2 +-
 states/zsh/files/zshenv    | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/states/git/init.sls b/states/git/init.sls
index 2bfd1ca..6090612 100644
--- a/states/git/init.sls
+++ b/states/git/init.sls
@@ -15,7 +15,8 @@ include:
   'core.excludesfile': '/home/' + grains['user'] + '/.gitignore',
   'merge.tool': 'diffuse',
   'merge.ff': 'false',
-  'pull.rebase': 'false',
+  'pull.rebase': 'true',
+  'pull.ff': 'true',
   'push.default': 'simple',
   'alias.lg': 'log --graph --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
   'alias.hist': 'log --graph --full-history --all --pretty=format:\'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset\' --date=short',
diff --git a/states/tmux/files/wm_copy b/states/tmux/files/wm_copy
index 1ea6ef0..4e4750a 100644
--- a/states/tmux/files/wm_copy
+++ b/states/tmux/files/wm_copy
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [[ $XDG_SESSION_TYPE == "wayland" ]]; then
+if [ $XDG_SESSION_TYPE == "wayland" ]; then
     wl-copy < /dev/stdin > /dev/null
 else
     xclip -selection clipboard -i < /dev/stdin > /dev/null
diff --git a/states/tmux/files/wm_paste b/states/tmux/files/wm_paste
index abf1385..80e1095 100644
--- a/states/tmux/files/wm_paste
+++ b/states/tmux/files/wm_paste
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [[ XDG_SESSION_TYPE == "wayland" ]]; then
+if [ $XDG_SESSION_TYPE == "wayland" ]; then
     wl-paste
 else
     xclip -selection clipboard -o
diff --git a/states/zsh/files/zshenv b/states/zsh/files/zshenv
index 8e1518c..ab80266 100644
--- a/states/zsh/files/zshenv
+++ b/states/zsh/files/zshenv
@@ -3,6 +3,7 @@ path=(~/.local/bin ~/.cargo/bin $path[@])
 
 if [[ $XDG_SESSION_TYPE == "wayland" ]]; then
     export QT_QPA_PLATFORM=wayland-egl
+    export MOZ_ENABLE_WAYLAND=1
 fi
 
 # make less more friendly for non-text input files, see lesspipe(1)
-- 
2.46.2


From e3053316585b19cc62dfef370e9f726716f013a9 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 20 Oct 2022 09:41:21 +0100
Subject: [PATCH 13/16] Don't sov

---
 states/sway/arch.sls           | 1 -
 states/sway/files/config.jinja | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/states/sway/arch.sls b/states/sway/arch.sls
index 44936af..e3a00fd 100644
--- a/states/sway/arch.sls
+++ b/states/sway/arch.sls
@@ -9,7 +9,6 @@ install sway:
       - mako
       - libnotify
       - dmenu
-      - sov
 
 ensure dmenu-wl wrapper:
   file.managed:
diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 8758db8..4b30447 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -191,16 +191,12 @@ input 1133:49948:Logitech_USB_Keyboard {
 #
     # 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:
 #
@@ -271,8 +267,6 @@ include /etc/sway/config.d/*
 {%- do salt.log.error('sway/files/' + host) -%}
 {% include 'sway/files/' + host %}
 
-exec rm -f /tmp/sovpipe && mkfifo /tmp/sovpipe && tail -f /tmp/sovpipe | sov
-
 for_window [app_id="zoom" title="^zoom$"] border none, floating enable
 for_window [app_id="zoom" title="^(Zoom|About)$"] border pixel, floating enable
 for_window [app_id="zoom" title="Settings"] floating enable, floating_minimum_size 960 x 700
-- 
2.46.2


From 89ff4fdf7fcc0db6ffc5c91cb65adca4e9ca8ac2 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 20 Oct 2022 10:05:10 +0100
Subject: [PATCH 14/16] Run zoom on startup

---
 states/sway/files/baryte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/states/sway/files/baryte b/states/sway/files/baryte
index 6503657..f2176d0 100644
--- a/states/sway/files/baryte
+++ b/states/sway/files/baryte
@@ -78,3 +78,4 @@ workspace 3 output DP-3
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 exec mako&
 exec ~/.local/bin/monitor_switch_sway&
+exec zoom&
-- 
2.46.2


From 259bec4164a0274cdd2a834be672468a611c7c54 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 20 Oct 2022 10:49:19 +0100
Subject: [PATCH 15/16] Use rofi wayland fork

---
 states/sway/arch.sls           | 2 +-
 states/sway/files/config.jinja | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/states/sway/arch.sls b/states/sway/arch.sls
index e3a00fd..1d370f4 100644
--- a/states/sway/arch.sls
+++ b/states/sway/arch.sls
@@ -5,7 +5,7 @@ install sway:
       - swaylock
       - swayidle
       - swaybg
-      - wofi
+      - rofi-lbonn-wayland
       - mako
       - libnotify
       - dmenu
diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 4b30447..7d11eb0 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 dmenu_path | rofi --dmenu | xargs swaymsg exec --
 
 include /etc/sway/config-vars.d/*
 
-- 
2.46.2


From e4871bbe3cd1b1057c5927ba6da65b3e2a7f99b6 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 20 Oct 2022 15:48:57 +0100
Subject: [PATCH 16/16] Use rofi properly

---
 states/sway/files/config.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 7d11eb0..8185333 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 | rofi --dmenu | xargs swaymsg exec --
+set $menu rofi -show drun | xargs swaymsg exec --
 
 include /etc/sway/config-vars.d/*
 
-- 
2.46.2