diff --git a/roles/dotfiles/files/sway_config b/roles/dotfiles/files/sway_config
index 12904c6..560b411 100644
--- a/roles/dotfiles/files/sway_config
+++ b/roles/dotfiles/files/sway_config
@@ -25,8 +25,6 @@ set $wallpaper ~/pictures/wallpaper/voxel-city-by-huntingfluff.jpg
 bindsym --release Print exec grimshot copy area
 # lock
 bindsym Mod1+l exec swaylock -f -i $wallpaper -s fill
-# dynamic monitor configuration, see ~/.config/kanshi/config, get outputs with swaymsg -t get_outputs
-exec_always "pkill kanshi; kanshi"
 # titlebars
 default_border pixel
 default_floating_border pixel
@@ -41,9 +39,9 @@ exec gammastep -l50.81:6.37
 # https://github.com/emersion/xdg-desktop-portal-wlr#running
 exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway
 
+# dynamic monitor configuration, see ~/.config/kanshi/config, get outputs with swaymsg -t get_outputs
+exec_always "pkill kanshi; kanshi"
 
-### Output configuration
-#
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
 output * bg $wallpaper fill
 
diff --git a/roles/dotfiles/files/vimrc b/roles/dotfiles/files/vimrc
index 35fe003..45dbb03 100644
--- a/roles/dotfiles/files/vimrc
+++ b/roles/dotfiles/files/vimrc
@@ -36,6 +36,7 @@ augroup sh
 	autocmd FileType sh :set tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent fileformat=unix
 augroup end
 autocmd FileType dockerfile :set tabstop=4 softtabstop=4 shiftwidth=4 expandtab autoindent fileformat=unix
+autocmd FileType bzl :set tabstop=4 softtabstop=4 shiftwidth=4 expandtab autoindent fileformat=unix
 autocmd FileType nginx :set tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent fileformat=unix
 autocmd FileType gitcommit :set spell
 autocmd FileType markdown :set spell
@@ -120,3 +121,9 @@ let g:terraform_align = 1
 
 "underline spell errors in terminals
 hi SpellBad ctermfg=218 cterm=underline
+
+" workaround for https://github.com/vim/vim/issues/11766
+let &t_BE = ""
+let &t_BD = "\e[?2004l"
+exec "set t_PS=\e[200~"
+exec "set t_PE=\e[201~"