diff --git a/fish/config.fish b/fish/config.fish
index a074523..1951d22 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,6 +1,9 @@
 # Disable greeting
 set fish_greeting
 
+# Use Neovim as the default text editor
+set -x EDITOR "nvim"
+
 alias icloud="cd ~/Library/Mobile\ Documents/com~apple~CloudDocs"
 alias pi="ssh pi@pi.misva.me -p 1733"
 alias gcp="ssh mikkelsvartveit@gcp.misva.me"
@@ -79,6 +82,7 @@ fish_add_path "$HOME/.pyenv/bin" # pyenv
 fish_add_path "$HOME/Library/pnpm" # pnpm
 fish_add_path "$HOME/go/bin" # Go
 fish_add_path "$HOME/.cargo/bin" # Rust
+fish_add_path "$HOME/.codeium/windsurf/bin" # Windsurf
 if [ -f "$HOME/Applications/google-cloud-sdk/path.fish.inc" ]; . "$HOME/Applications/google-cloud-sdk/path.fish.inc"; end # Google Cloud SDK
 
 # Initialize pnpm
@@ -97,6 +101,3 @@ set --export PATH $BUN_INSTALL/bin $PATH
 # Added by OrbStack: command-line tools and integration
 # This won't be added again if you remove it.
 source ~/.orbstack/shell/init2.fish 2>/dev/null || :
-
-# Added by Windsurf
-fish_add_path /Users/mikkelsvartveit/.codeium/windsurf/bin
diff --git a/git/config b/git/config
index 61d4f4a..3b429e3 100644
--- a/git/config
+++ b/git/config
@@ -1,9 +1,13 @@
+[alias]
+	yield = !git pull --rebase --autostash && git push
+	yolofix = !git commit -v -a --no-edit --amend && git push --force-with-lease
 [user]
 	name = Mikkel Svartveit
 	email = mikkel.svartveit@gmail.com
 [core]
 	excludesfile = ~/.config/git/gitignore_global
 	editor = nvim
+  pager = "delta --syntax-theme=ansi --dark"
 [init]
 	defaultBranch = main
 [pull]
@@ -21,6 +25,3 @@
 	cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
 [mergetool]
 	prompt = false
-[alias]
-	yield = !git pull --rebase --autostash && git push
-	yolofix = !git commit -v -a --no-edit --amend && git push --force-with-lease
diff --git a/git/gitignore_global b/git/gitignore_global
index 5fd0411..5567880 100644
--- a/git/gitignore_global
+++ b/git/gitignore_global
@@ -1,2 +1,3 @@
 .DS_Store
 .vim
+**/.claude/settings.local.json
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index a7eef8b..a8c6e08 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -21,9 +21,9 @@
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
-  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "windsurf.vim": { "branch": "main", "commit": "272c6e2755e8faa90e26bcdcd9fde6b9e61751ea" }
 }
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 9bc4064..3d1bfbd 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -160,18 +160,16 @@ require("lazy").setup({
 		opts = {},
 	},
 
-	-- Supermaven AI assist
+	-- AI autocompletion
 	{
-		"supermaven-inc/supermaven-nvim",
+		"Exafunction/windsurf.vim",
+		event = "BufEnter",
 		config = function()
-			vim.api.nvim_create_user_command("CPE", "SupermavenStart", {})
-			vim.api.nvim_create_user_command("CPD", "SupermavenStop", {})
-
-			require("supermaven-nvim").setup({})
+			vim.api.nvim_create_user_command("CPE", "CodeiumEnable", {})
+			vim.api.nvim_create_user_command("CPD", "CodeiumDisable", {})
 
 			-- Disable on startup
-			local api = require("supermaven-nvim.api")
-			api.stop()
+			vim.cmd("CodeiumDisable")
 		end,
 	},
 
@@ -184,7 +182,11 @@ require("lazy").setup({
 		config = function()
 			require("claude-code").setup({
 				window = {
-					split_ratio = 0.5,
+					position = "botright vsplit",
+					split_ratio = 0.4,
+				},
+				keymaps = {
+					window_navigation = false,
 				},
 			})
 		end,