diff --git a/dot_config/bspwm/executable_bspwmrc b/dot_config/bspwm/executable_bspwmrc
index 182a517..b3de6fc 100644
--- a/dot_config/bspwm/executable_bspwmrc
+++ b/dot_config/bspwm/executable_bspwmrc
@@ -19,4 +19,6 @@ bspc rule -a Kupfer.py focus=on
 bspc rule -a Screenkey manage=off
 bspc rule -a Emacs follow=on state=tiled
 
-/home/dorian/.config/polybar/launch.sh
+killall -q polybar
+polybar example
+picom
diff --git a/dot_config/chezmoi/chezmoi.toml b/dot_config/chezmoi/chezmoi.toml
new file mode 100644
index 0000000..0ff226d
--- /dev/null
+++ b/dot_config/chezmoi/chezmoi.toml
@@ -0,0 +1,4 @@
+[git]
+    autoCommit = true
+[merge]
+    command = emacsclient --eval "(ediff \"$1\" \"$2\")"
diff --git a/dot_config/polybar/config b/dot_config/polybar/config
index 4ec93d8..b65b7f8 100644
--- a/dot_config/polybar/config
+++ b/dot_config/polybar/config
@@ -138,7 +138,7 @@ label-empty-foreground = ${colors.foreground-alt}
 label-empty-padding = 2
 
 ; Separator in between workspaces
-label-separator = |
+;label-separator = |
 
 [module/mpd]
 type = internal/mpd
diff --git a/dot_config/polybar/executable_launch.sh b/dot_config/polybar/executable_launch.sh
index fd1b2e9..58987fa 100644
--- a/dot_config/polybar/executable_launch.sh
+++ b/dot_config/polybar/executable_launch.sh
@@ -1,5 +1,4 @@
-#!/bin/bash
-set -euo pipefail
+#!/usr/bin/bash
 
 # Terminate already running bar instances
 killall -q polybar