diff --git a/chezmoi/private_dot_config/i3/config b/chezmoi/private_dot_config/i3/config
index f678c74..9e394bb 100644
--- a/chezmoi/private_dot_config/i3/config
+++ b/chezmoi/private_dot_config/i3/config
@@ -4,7 +4,7 @@
 #
 ### Startup
 exec_always --no-startup-id autotiling
-exec --no-startup-id bash -c 'while sleep 1; do flock ~/.polybar.lock polybar mybar; done'
+exec --no-startup-id bash -c 'trap "jobs -rp | xargs -r kill" EXIT; while sleep 1; do for MONITOR in $(polybar --list-monitors | cut -d : -f 1); do MONITOR="$MONITOR" flock "${HOME}/.cache/polybar.${MONITOR}.lock" polybar mybar & done; wait -n; jobs -rp | xargs -r kill; done'
 exec --no-startup-id bash -c 'while sleep 15; do autorandr --change; done'
 exec --no-startup-id dunst
 exec --no-startup-id nm-applet
@@ -50,14 +50,14 @@ bindsym $mod+Escape exec loginctl list-sessions | awk -v UID=$UID '$2 == UID{pri
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec alacritty
+bindsym $mod+Return exec wezterm
 
 # kill focused window
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
 #bindsym $mod+d exec --no-startup-id dmenu_run
-bindsym $mod+d exec --no-startup-id rofi -show combi -run-shell-command 'alacritty -e zsh -ic "{cmd} && read"'
+bindsym $mod+d exec --no-startup-id rofi -show combi -run-shell-command 'wezterm -- zsh -ic "{cmd} && read"'
 # A more modern dmenu replacement is rofi:
 # bindcode $mod+40 exec "rofi -modi drun,run -show drun"
 # There also is i3-dmenu-desktop which only displays applications shipping a
diff --git a/chezmoi/private_dot_config/polybar/config b/chezmoi/private_dot_config/polybar/config
index 59812c9..3bc0e5c 100644
--- a/chezmoi/private_dot_config/polybar/config
+++ b/chezmoi/private_dot_config/polybar/config
@@ -28,7 +28,7 @@ secondary = #e60053
 alert = #bd2c40
 
 [bar/mybar]
-;monitor = ${env:MONITOR:HDMI-1}
+monitor = ${env:MONITOR:}
 width = 100%
 height = 27
 ;offset-x = 1%