diff --git a/.config/git/config b/.config/git/config
index 267e6da..0cc0a01 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -13,7 +13,9 @@
   helper = cache --timeout=604800
 
 [diff]
-  tool = vimdiff
+    tool = nvimdiff
+[difftool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
 
 [http]
 	postBuffer = 524288000
@@ -25,8 +27,16 @@
 [init]
 	defaultBranch = main
 [merge]
+	tool = "nvim"
     conflictstyle = diff3
 
+[mergetool]
+	keepBackup = false
+	prompt = true
+
+[mergetool "nvim"]
+	cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
+
 # Set a correct user.name and user.email for work projects
 [includeIf "gitdir:~/git/work/"]
     path = ~/git/work/gitconfig
diff --git a/.config/yabai/yabairc b/.config/yabai/yabairc
index ce60924..9717393 100755
--- a/.config/yabai/yabairc
+++ b/.config/yabai/yabairc
@@ -10,7 +10,7 @@ yabai -m config layout bsp
 yabai -m config window_placement second_child
 
 # Global
-yabai -m config focus_follows_mouse off
+yabai -m config focus_follows_mouse autofocus
 yabai -m config mouse_follows_focus on
 
 yabai -m config layout bsp
@@ -20,7 +20,7 @@ yabai -m config top_padding 8
 yabai -m config bottom_padding 8
 yabai -m config left_padding 8
 yabai -m config right_padding 8
-yabai -m config window_gap 16
+yabai -m config window_gap 12
 
 yabai -m config mouse_action1 move
 yabai -m config mouse_action2 resize