tmux: Enable detach-on-destroy for scratch sessions

The zsh tmux plugin has been removed and instead fzf is shown to select
a session.

.gitmodules

@@ -16,6 +16,3 @@
 [submodule "zsh/custom/plugins/zsh-completions"]
 	path = zsh/custom/plugins/zsh-completions
 	url = https://github.com/zsh-users/zsh-completions.git
-[submodule "zsh/custom/plugins/zsh-vi-mode"]
-	path = zsh/custom/plugins/zsh-vi-mode
-	url = https://github.com/jeffreytse/zsh-vi-mode

git-aim/dot-gitconfig

@@ -1,11 +0,0 @@
-[include]
-	path = ~/.dotfiles/git/configs/common.gitconfig
-
-	path = ~/.dotfiles/git/profiles/aim-robotics.gitconfig
-
-[includeIf "gitdir:~/.dotfiles/"]
-	path = ~/.dotfiles/git/profiles/Dreaded_X.gitconfig
-
-; I don't have my private key on work machines
-[commit]
-	gpgsign = false

git-aim/dot-local

@@ -1 +0,0 @@
-../git/dot-local

git-alten/dot-gitconfig

@@ -2,10 +2,3 @@
 	path = ~/.dotfiles/git/configs/common.gitconfig
 
 	path = ~/.dotfiles/git/profiles/ALTEN.gitconfig
-
-[includeIf "gitdir:~/.dotfiles"]
-	path = ~/.dotfiles/git/profiles/Dreaded_X.gitconfig
-
-; I don't have my private key on work machines
-[commit]
-	gpgsign = false

git-alten/dot-local

@@ -1 +0,0 @@
-../git/dot-local

git/configs/common.gitconfig

@@ -4,7 +4,6 @@
 
 [push]
 	default = simple
-	autoSetupRemote = true
 
 [core]
 	excludesfile = ~/.dotfiles/git/gitignore
@@ -25,7 +24,7 @@
 	tool = nvimdiff
 
 [init]
-	defaultBranch = main
+	defaultBranch = master
 
 [rebase]
   autosquash = true

git/dot-gitconfig

@@ -5,6 +5,3 @@
 
 [includeIf "gitdir:~/Projects/ALTEN/"]
 	path = ~/.dotfiles/git/profiles/ALTEN.gitconfig
-
-[includeIf "gitdir:~/Projects/aim-robotics/"]
-	path = ~/.dotfiles/git/profiles/aim-robotics.gitconfig

git/profiles/aim-robotics.gitconfig

@@ -1,6 +0,0 @@
-[user]
-	name = Tim Huizinga
-	email = th@aimrobotics.nl
-
-[commit]
-	gpgsign = false

helpers/legacy_ubuntu_nvim.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -euo pipefail
+set -e
 
 # Install additional dependencies
 sudo apt-get install fuse libfuse2 unzip ripgrep python3-venv xclip -y --no-install-recommends
@@ -19,3 +19,6 @@ rm -rf ~/.dotfiles
 git clone https://git.huizinga.dev/Dreaded_X/dotfiles ~/.dotfiles
 mkdir -p ~/.config
 ln -s ~/.dotfiles/nvim/dot-config/nvim ~/.config/nvim
+
+# Remove include paths from copied host gitconfig
+sed -i '/path = /d' ~/.gitconfig

nvim/dot-config/nvim/lazy-lock.json

@@ -1,54 +1,50 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "actions-preview.nvim": { "branch": "master", "commit": "cb938c25edaac38d362555f19244a9cb85d561e8" },
+  "actions-preview.nvim": { "branch": "master", "commit": "36513ad213855d497b7dd3391a24d1d75d58e36f" },
-  "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" },
+  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" },
-  "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
+  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
-  "crates.nvim": { "branch": "main", "commit": "afcd1cc3eeceb5783676fc8464389b9216a29d05" },
-  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "eyeliner.nvim": { "branch": "main", "commit": "8f197eb30cecdf4c2cc9988a5eecc6bc34c0c7d6" },
-  "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
+  "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" },
-  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitlab.nvim": { "branch": "develop", "commit": "3d2828a9504b87fc36ee2aca1b0f36cf75003edd" },
+  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
-  "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
+  "gruvbox.nvim": { "branch": "main", "commit": "a56f758f9d3eed0b8afbab6ea3ee523887755aed" },
-  "gruvbox.nvim": { "branch": "main", "commit": "334d5fd49fc8033f26408425366c66c6390c57bb" },
   "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
-  "inc-rename.nvim": { "branch": "main", "commit": "0074b551a17338ccdcd299bd86687cc651bcb33d" },
+  "inc-rename.nvim": { "branch": "main", "commit": "8ae25b35ae16ca4bd5de3d3c472eec3b574018d4" },
   "kubernetes.nvim": { "branch": "main", "commit": "44daf998345628a1a7034e3aaa31f4e05e4dde7c" },
-  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
+  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
-  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
-  "multicolumn.nvim": { "branch": "master", "commit": "a363bdfd422abf26256f343dac4df183031f8e94" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "ef211089af881bea206c7aa3f2693a81feee7e90" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
   "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "0203a9608d63eda57679b01e69f33a7b4c34b0d1" },
+  "nvim-lspconfig": { "branch": "master", "commit": "3a8d621d74bd9760b9f8dbc4fdfb937bb13d2f49" },
-  "nvim-surround": { "branch": "main", "commit": "61319d4bd1c5e336e197defa15bd104c51f0fb29" },
+  "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
   "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "ros-nvim": { "branch": "main", "commit": "1ad64cd3a1e144dfea67890845f9da2e82d96900" },
-  "schema-companion.nvim": { "branch": "main", "commit": "9a8cbeb9429958524331f49a4bd9c25cfbc2c208" },
+  "schema-companion.nvim": { "branch": "main", "commit": "b22243d3ca71be08d06a4b9bf200c1d677c41d45" },
-  "schemastore.nvim": { "branch": "main", "commit": "27f7d753990c8d79bdefe75be0094e7e86eabf16" },
+  "schemastore.nvim": { "branch": "main", "commit": "2ae6d27897c60265d4ad3f33e286528d519098fd" },
-  "scrollEOF.nvim": { "branch": "master", "commit": "e462b9a07b8166c3e8011f1dcbc6bf68b67cd8d7" },
+  "scrollEOF.nvim": { "branch": "master", "commit": "aeedfad14e4a0cfa31b44b531c1ad8fd4696b551" },
-  "smart-open.nvim": { "branch": "0.3.x", "commit": "918c97cac0c33f7a116a822df144bc5bbefa4490" },
+  "smart-open.nvim": { "branch": "0.2.x", "commit": "560d8f16e17977c8303db6f9660db58a4415ca41" },
-  "smart-splits.nvim": { "branch": "master", "commit": "25bf40abf79720ebfa98e09259b7c42942055f4c" },
+  "smart-splits.nvim": { "branch": "master", "commit": "1ac316e6ea719843fd80716d1105613c98632af1" },
-  "snacks.nvim": { "branch": "main", "commit": "9912042fc8bca2209105526ac7534e9a0c2071b2" },
+  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
+  "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "72e160cb1ce8c0db2ac4315f77d97420a2f4223d" },
+  "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "2025a181c303cec0fabd4bbdc9d752574ceda2d9" },
-  "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" },
+  "undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" },
-  "which-key.nvim": { "branch": "winborder-support", "commit": "ab1a3b0d3005a95507ba6c18b96531d430370885" }
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }

nvim/dot-config/nvim/lsp/basedpyright.lua

@@ -1,17 +1,3 @@
-local function uv_script_interpreter(script_path)
-	local result = vim.system({ "uv", "python", "find", "--script", script_path }, { text = true }):wait()
-	if result.code == 0 then
-		return vim.fn.trim(result.stdout)
-	end
-end
-
-local function uv_interpreter()
-	local result = vim.system({ "uv", "python", "find" }, { text = true }):wait()
-	if result.code == 0 then
-		return vim.fn.trim(result.stdout)
-	end
-end
-
 return {
 	settings = {
 		basedpyright = {
@@ -19,14 +5,5 @@ return {
 				typeCheckingMode = "standard",
 			},
 		},
-		python = {},
 	},
-	before_init = function(_, config)
-		local script = vim.api.nvim_buf_get_name(0)
-		local python = uv_script_interpreter(script)
-		if not python then
-			python = uv_interpreter()
-		end
-		config.settings.python.pythonPath = python
-	end,
 }

nvim/dot-config/nvim/lsp/jsonls.lua

@@ -1,16 +1,8 @@
-return require("schema-companion").setup_client(
+return {
-	require("schema-companion").adapters.jsonls.setup({
+	settings = {
-		sources = {
+		json = {
-			require("schema-companion").sources.lsp.setup(),
+			validate = { enable = true },
-			require("schema-companion").sources.none.setup(),
+			schemas = require("schemastore").json.schemas(),
 		},
-	}),
+	},
-	{
+}
-		settings = {
-			json = {
-				validate = { enable = true },
-				schemas = require("schemastore").json.schemas(),
-			},
-		},
-	}
-)

nvim/dot-config/nvim/lsp/lua_ls.lua

@@ -1,23 +1,8 @@
 return {
 	settings = {
 		Lua = {
-			workspace = {
+			workspace = { checkThirdParty = false },
-				checkThirdParty = false,
-				library = {
-					"./definitions",
-				},
-			},
 			telemetry = { enable = false },
-			type = {
-				checkTableShape = true,
-			},
-			diagnostics = {
-				neededFileStatus = {
-					-- ["no-unknown"] = "Opened",
-					-- ["incomplete-signature-doc"] = "Opened",
-					-- ["await-in-sync"] = "Opened",
-				},
-			},
 		},
 	},
 }

nvim/dot-config/nvim/lsp/taplo.lua

@@ -1,9 +0,0 @@
-return require("schema-companion").setup_client(
-	require("schema-companion").adapters.taplo.setup({
-		sources = {
-			require("schema-companion").sources.lsp.setup(),
-			require("schema-companion").sources.none.setup(),
-		},
-	}),
-	{}
-)

nvim/dot-config/nvim/lsp/yamlls.lua

@@ -1,10 +1,5 @@
-return require("schema-companion").setup_client(
+return require("schema-companion").setup_client({
-	require("schema-companion").adapters.yamlls.setup({
+	settings = {
-		sources = {
+		yaml = {},
-			require("matchers.kubernetes").setup({}),
+	},
-			require("schema-companion").sources.lsp.setup(),
+})
-			require("schema-companion").sources.none.setup(),
-		},
-	}),
-	{}
-)

nvim/dot-config/nvim/lua/lsp.lua

@@ -75,20 +75,20 @@ local function on_attach(client, bufnr)
 	end
 
 	-- Highlight references under cursor
-	-- if client:supports_method(methods.textDocument_documentHighlight) then
+	if client:supports_method(methods.textDocument_documentHighlight) then
-	-- 	local lsp_hover_hl = vim.api.nvim_create_augroup("LspHoverHighlight", { clear = false })
+		local lsp_hover_hl = vim.api.nvim_create_augroup("LspHoverHighlight", { clear = false })
-	-- 	vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
+		vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
-	-- 		buffer = bufnr,
+			buffer = bufnr,
-	-- 		group = lsp_hover_hl,
+			group = lsp_hover_hl,
-	-- 		callback = vim.lsp.buf.document_highlight,
+			callback = vim.lsp.buf.document_highlight,
-	-- 	})
+		})
-	--
+
-	-- 	vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
+		vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
-	-- 		buffer = bufnr,
+			buffer = bufnr,
-	-- 		group = lsp_hover_hl,
+			group = lsp_hover_hl,
-	-- 		callback = vim.lsp.buf.clear_references,
+			callback = vim.lsp.buf.clear_references,
-	-- 	})
+		})
-	-- end
+	end
 end
 
 vim.diagnostic.config({
@@ -148,10 +148,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 	end,
 })
 
--- Manually enable lsps, if installed
+-- Manually enable rust analyzer, if installed
 if vim.fn.executable("rust_analyzer") then
 	vim.lsp.enable("rust_analyzer")
 end
-if vim.fn.executable("vtsls") then
-	vim.lsp.enable("vtsls")
-end

nvim/dot-config/nvim/lua/matchers/kubernetes.lua

@@ -1,57 +0,0 @@
----@class schema_companion.Source
-local M = {}
-
-M.name = "Kubernetes"
-
-M.config = {}
-
----@param config {}
----@return schema_companion.Source
-function M.setup(config)
-	setmetatable(M, {})
-	M.config = vim.tbl_deep_extend("force", {}, M.config, config)
-
-	return M
-end
-
-function M:match(_, bufnr)
-	local resources = {}
-
-	local current = {}
-	for _, line in pairs(vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)) do
-		local _, _, group, version = line:find([[^apiVersion:%s*["']?([^%s"'/]*)/?([^%s"']*)]])
-		local _, _, kind = line:find([[^kind:%s*["']?([^%s"'/]*)]])
-
-		if group and group ~= "" then
-			current.group = group
-		end
-		if version and version ~= "" then
-			current.version = version
-		end
-		if kind and kind ~= "" then
-			current.kind = kind
-		end
-
-		if current.group and current.kind then
-			table.insert(resources, current)
-			current = {}
-		end
-	end
-
-	local schemas = {}
-	for _, resource in pairs(resources) do
-		local api = resource.version and ("%s/%s"):format(resource.group, resource.version) or resource.group
-		local schema = {
-			name = ("%s@%s"):format(resource.kind, api),
-			source = M.name,
-			uri = require("kubernetes").yamlls_schema(),
-		}
-		if schema then
-			table.insert(schemas, schema)
-		end
-	end
-
-	return schemas
-end
-
-return M

nvim/dot-config/nvim/lua/plugins/bufresize.lua

@@ -1,6 +1,4 @@
 -- https://github.com/kwkarlwang/bufresize.nvim
---- @module "lazy"
---- @type LazySpec
 return {
 	"kwkarlwang/bufresize.nvim",
 	opts = {},

nvim/dot-config/nvim/lua/plugins/colorizer.lua

@@ -15,12 +15,8 @@ return {
 			"!popup",
 		},
 		always_update = true,
-		options = {
+		user_default_options = {
-			parsers = {
+			names = false,
-				names = {
-					enabled = false,
-				},
-			},
 		},
 	},
 }

nvim/dot-config/nvim/lua/plugins/conform.lua

@@ -5,15 +5,15 @@ local formatters_by_ft = {
 	go = { "goimports" },
 	python = { "ruff_organize_imports", "ruff_format" },
 	rust = { "rustfmt" },
-	javascript = { "prettier" },
+	javascript = { "prettierd" },
-	javascriptreact = { "prettier" },
+	javascriptreact = { "prettierd" },
-	typescript = { "prettier" },
+	typescript = { "prettierd" },
-	typescriptreact = { "prettier" },
+	typescriptreact = { "prettierd" },
-	css = { "prettier" },
+	css = { "prettierd" },
-	markdown = { "prettier" },
+	markdown = { "prettierd" },
-	yaml = { "prettier" },
+	yaml = { "prettierd" },
 	lua = { "stylua" },
-	json = { "prettier" },
+	json = { "prettierd" },
 	toml = { "taplo" },
 	-- ["*"] = { "injected" },
 	["_"] = { "trim_whitespace", "trim_newlines" },

nvim/dot-config/nvim/lua/plugins/crates.lua

@@ -1,21 +0,0 @@
--- https://github.com/Saecki/crates.nvim
---- @module "lazy"
---- @type LazySpec
-return {
-	"Saecki/crates.nvim",
-	event = { "BufRead Cargo.toml" },
-	tag = "stable",
-	--- @type crates.UserConfig
-	opts = {
-		popup = {
-			hide_on_select = true,
-			border = require("symbols.window").border,
-		},
-		lsp = {
-			enabled = true,
-			actions = true,
-			completion = true,
-			hover = true,
-		},
-	},
-}

nvim/dot-config/nvim/lua/plugins/diffview.lua

@@ -1,412 +0,0 @@
--- https://github.com/sindrets/diffview.nvim
---- @module "lazy"
---- @type LazySpec
-return {
-	"sindrets/diffview.nvim",
-	opts = function()
-		local actions = require("diffview.actions")
-
-		return {
-			use_icons = false,
-			-- Disable default keymaps just so we can change <leader>e -> <leader>f
-			keymaps = {
-				disable_defaults = true,
-				view = {
-					-- The `view` bindings are active in the diff buffers, only when the current
-					-- tabpage is a Diffview.
-					{
-						"n",
-						"<tab>",
-						actions.select_next_entry,
-						{ desc = "Open the diff for the next file" },
-					},
-					{
-						"n",
-						"<s-tab>",
-						actions.select_prev_entry,
-						{ desc = "Open the diff for the previous file" },
-					},
-					{
-						"n",
-						"[F",
-						actions.select_first_entry,
-						{ desc = "Open the diff for the first file" },
-					},
-					{
-						"n",
-						"]F",
-						actions.select_last_entry,
-						{ desc = "Open the diff for the last file" },
-					},
-					{
-						"n",
-						"gf",
-						actions.goto_file_edit,
-						{ desc = "Open the file in the previous tabpage" },
-					},
-					{ "n", "<C-w><C-f>", actions.goto_file_split, { desc = "Open the file in a new split" } },
-					{ "n", "<C-w>gf", actions.goto_file_tab, { desc = "Open the file in a new tabpage" } },
-					{ "n", "<leader>f", actions.focus_files, { desc = "Bring focus to the file panel" } },
-					{ "n", "<leader>b", actions.toggle_files, { desc = "Toggle the file panel." } },
-					{
-						"n",
-						"g<C-x>",
-						actions.cycle_layout,
-						{ desc = "Cycle through available layouts." },
-					},
-					{
-						"n",
-						"[x",
-						actions.prev_conflict,
-						{ desc = "In the merge-tool: jump to the previous conflict" },
-					},
-					{
-						"n",
-						"]x",
-						actions.next_conflict,
-						{ desc = "In the merge-tool: jump to the next conflict" },
-					},
-					{
-						"n",
-						"<leader>co",
-						actions.conflict_choose("ours"),
-						{ desc = "Choose the OURS version of a conflict" },
-					},
-					{
-						"n",
-						"<leader>ct",
-						actions.conflict_choose("theirs"),
-						{ desc = "Choose the THEIRS version of a conflict" },
-					},
-					{
-						"n",
-						"<leader>cb",
-						actions.conflict_choose("base"),
-						{ desc = "Choose the BASE version of a conflict" },
-					},
-					{
-						"n",
-						"<leader>ca",
-						actions.conflict_choose("all"),
-						{ desc = "Choose all the versions of a conflict" },
-					},
-					{ "n", "dx", actions.conflict_choose("none"), { desc = "Delete the conflict region" } },
-					{
-						"n",
-						"<leader>cO",
-						actions.conflict_choose_all("ours"),
-						{ desc = "Choose the OURS version of a conflict for the whole file" },
-					},
-					{
-						"n",
-						"<leader>cT",
-						actions.conflict_choose_all("theirs"),
-						{ desc = "Choose the THEIRS version of a conflict for the whole file" },
-					},
-					{
-						"n",
-						"<leader>cB",
-						actions.conflict_choose_all("base"),
-						{ desc = "Choose the BASE version of a conflict for the whole file" },
-					},
-					{
-						"n",
-						"<leader>cA",
-						actions.conflict_choose_all("all"),
-						{ desc = "Choose all the versions of a conflict for the whole file" },
-					},
-					{
-						"n",
-						"dX",
-						actions.conflict_choose_all("none"),
-						{ desc = "Delete the conflict region for the whole file" },
-					},
-				},
-				file_panel = {
-					{
-						"n",
-						"j",
-						actions.next_entry,
-						{ desc = "Bring the cursor to the next file entry" },
-					},
-					{
-						"n",
-						"<down>",
-						actions.next_entry,
-						{ desc = "Bring the cursor to the next file entry" },
-					},
-					{
-						"n",
-						"k",
-						actions.prev_entry,
-						{ desc = "Bring the cursor to the previous file entry" },
-					},
-					{
-						"n",
-						"<up>",
-						actions.prev_entry,
-						{ desc = "Bring the cursor to the previous file entry" },
-					},
-					{
-						"n",
-						"<cr>",
-						actions.select_entry,
-						{ desc = "Open the diff for the selected entry" },
-					},
-					{
-						"n",
-						"o",
-						actions.select_entry,
-						{ desc = "Open the diff for the selected entry" },
-					},
-					{
-						"n",
-						"l",
-						actions.select_entry,
-						{ desc = "Open the diff for the selected entry" },
-					},
-					{
-						"n",
-						"<2-LeftMouse>",
-						actions.select_entry,
-						{ desc = "Open the diff for the selected entry" },
-					},
-					{
-						"n",
-						"-",
-						actions.toggle_stage_entry,
-						{ desc = "Stage / unstage the selected entry" },
-					},
-					{
-						"n",
-						"s",
-						actions.toggle_stage_entry,
-						{ desc = "Stage / unstage the selected entry" },
-					},
-					{ "n", "S", actions.stage_all, { desc = "Stage all entries" } },
-					{ "n", "U", actions.unstage_all, { desc = "Unstage all entries" } },
-					{
-						"n",
-						"X",
-						actions.restore_entry,
-						{ desc = "Restore entry to the state on the left side" },
-					},
-					{ "n", "L", actions.open_commit_log, { desc = "Open the commit log panel" } },
-					{ "n", "zo", actions.open_fold, { desc = "Expand fold" } },
-					{ "n", "h", actions.close_fold, { desc = "Collapse fold" } },
-					{ "n", "zc", actions.close_fold, { desc = "Collapse fold" } },
-					{ "n", "za", actions.toggle_fold, { desc = "Toggle fold" } },
-					{ "n", "zR", actions.open_all_folds, { desc = "Expand all folds" } },
-					{ "n", "zM", actions.close_all_folds, { desc = "Collapse all folds" } },
-					{ "n", "<c-b>", actions.scroll_view(-0.25), { desc = "Scroll the view up" } },
-					{ "n", "<c-f>", actions.scroll_view(0.25), { desc = "Scroll the view down" } },
-					{
-						"n",
-						"<tab>",
-						actions.select_next_entry,
-						{ desc = "Open the diff for the next file" },
-					},
-					{
-						"n",
-						"<s-tab>",
-						actions.select_prev_entry,
-						{ desc = "Open the diff for the previous file" },
-					},
-					{
-						"n",
-						"[F",
-						actions.select_first_entry,
-						{ desc = "Open the diff for the first file" },
-					},
-					{
-						"n",
-						"]F",
-						actions.select_last_entry,
-						{ desc = "Open the diff for the last file" },
-					},
-					{
-						"n",
-						"gf",
-						actions.goto_file_edit,
-						{ desc = "Open the file in the previous tabpage" },
-					},
-					{
-						"n",
-						"<C-w><C-f>",
-						actions.goto_file_split,
-						{ desc = "Open the file in a new split" },
-					},
-					{
-						"n",
-						"<C-w>gf",
-						actions.goto_file_tab,
-						{ desc = "Open the file in a new tabpage" },
-					},
-					{
-						"n",
-						"i",
-						actions.listing_style,
-						{ desc = "Toggle between 'list' and 'tree' views" },
-					},
-					{
-						"n",
-						"f",
-						actions.toggle_flatten_dirs,
-						{ desc = "Flatten empty subdirectories in tree listing style" },
-					},
-					{
-						"n",
-						"R",
-						actions.refresh_files,
-						{ desc = "Update stats and entries in the file list" },
-					},
-					{
-						"n",
-						"<leader>f",
-						actions.focus_files,
-						{ desc = "Bring focus to the file panel" },
-					},
-					{ "n", "<leader>b", actions.toggle_files, { desc = "Toggle the file panel" } },
-					{ "n", "g<C-x>", actions.cycle_layout, { desc = "Cycle available layouts" } },
-					{ "n", "[x", actions.prev_conflict, { desc = "Go to the previous conflict" } },
-					{ "n", "]x", actions.next_conflict, { desc = "Go to the next conflict" } },
-					{ "n", "g?", actions.help("file_panel"), { desc = "Open the help panel" } },
-					{
-						"n",
-						"<leader>cO",
-						actions.conflict_choose_all("ours"),
-						{ desc = "Choose the OURS version of a conflict for the whole file" },
-					},
-					{
-						"n",
-						"<leader>cT",
-						actions.conflict_choose_all("theirs"),
-						{ desc = "Choose the THEIRS version of a conflict for the whole file" },
-					},
-					{
-						"n",
-						"<leader>cB",
-						actions.conflict_choose_all("base"),
-						{ desc = "Choose the BASE version of a conflict for the whole file" },
-					},
-					{
-						"n",
-						"<leader>cA",
-						actions.conflict_choose_all("all"),
-						{ desc = "Choose all the versions of a conflict for the whole file" },
-					},
-					{
-						"n",
-						"dX",
-						actions.conflict_choose_all("none"),
-						{ desc = "Delete the conflict region for the whole file" },
-					},
-				},
-				file_history_panel = {
-					{ "n", "g!", actions.options, { desc = "Open the option panel" } },
-					{
-						"n",
-						"<C-A-d>",
-						actions.open_in_diffview,
-						{ desc = "Open the entry under the cursor in a diffview" },
-					},
-					{
-						"n",
-						"y",
-						actions.copy_hash,
-						{ desc = "Copy the commit hash of the entry under the cursor" },
-					},
-					{ "n", "L", actions.open_commit_log, { desc = "Show commit details" } },
-					{
-						"n",
-						"X",
-						actions.restore_entry,
-						{ desc = "Restore file to the state from the selected entry" },
-					},
-					{ "n", "zo", actions.open_fold, { desc = "Expand fold" } },
-					{ "n", "zc", actions.close_fold, { desc = "Collapse fold" } },
-					{ "n", "h", actions.close_fold, { desc = "Collapse fold" } },
-					{ "n", "za", actions.toggle_fold, { desc = "Toggle fold" } },
-					{ "n", "zR", actions.open_all_folds, { desc = "Expand all folds" } },
-					{ "n", "zM", actions.close_all_folds, { desc = "Collapse all folds" } },
-					{
-						"n",
-						"j",
-						actions.next_entry,
-						{ desc = "Bring the cursor to the next file entry" },
-					},
-					{
-						"n",
-						"<down>",
-						actions.next_entry,
-						{ desc = "Bring the cursor to the next file entry" },
-					},
-					{
-						"n",
-						"k",
-						actions.prev_entry,
-						{ desc = "Bring the cursor to the previous file entry" },
-					},
-					{
-						"n",
-						"<up>",
-						actions.prev_entry,
-						{ desc = "Bring the cursor to the previous file entry" },
-					},
-					{
-						"n",
-						"<cr>",
-						actions.select_entry,
-						{ desc = "Open the diff for the selected entry" },
-					},
-					{
-						"n",
-						"o",
-						actions.select_entry,
-						{ desc = "Open the diff for the selected entry" },
-					},
-					{
-						"n",
-						"l",
-						actions.select_entry,
-						{ desc = "Open the diff for the selected entry" },
-					},
-					{
-						"n",
-						"<2-LeftMouse>",
-						actions.select_entry,
-						{ desc = "Open the diff for the selected entry" },
-					},
-					{ "n", "<c-b>", actions.scroll_view(-0.25), { desc = "Scroll the view up" } },
-					{ "n", "<c-f>", actions.scroll_view(0.25), { desc = "Scroll the view down" } },
-					{ "n", "<tab>", actions.select_next_entry, { desc = "Open the diff for the next file" } },
-					{
-						"n",
-						"<s-tab>",
-						actions.select_prev_entry,
-						{ desc = "Open the diff for the previous file" },
-					},
-					{
-						"n",
-						"[F",
-						actions.select_first_entry,
-						{ desc = "Open the diff for the first file" },
-					},
-					{ "n", "]F", actions.select_last_entry, { desc = "Open the diff for the last file" } },
-					{
-						"n",
-						"gf",
-						actions.goto_file_edit,
-						{ desc = "Open the file in the previous tabpage" },
-					},
-					{ "n", "<C-w><C-f>", actions.goto_file_split, { desc = "Open the file in a new split" } },
-					{ "n", "<C-w>gf", actions.goto_file_tab, { desc = "Open the file in a new tabpage" } },
-					{ "n", "<leader>f", actions.focus_files, { desc = "Bring focus to the file panel" } },
-					{ "n", "<leader>b", actions.toggle_files, { desc = "Toggle the file panel" } },
-					{ "n", "g<C-x>", actions.cycle_layout, { desc = "Cycle available layouts" } },
-					{ "n", "g?", actions.help("file_history_panel"), { desc = "Open the help panel" } },
-				},
-			},
-		}
-	end,
-}

nvim/dot-config/nvim/lua/plugins/gitlab.lua

@@ -1,39 +0,0 @@
-local window = require("symbols.window")
--- https://github.com/harrisoncramer/gitlab.nvim
---- @module "lazy"
---- @type LazySpec
-return {
-	"harrisoncramer/gitlab.nvim",
-	dependencies = {
-		"MunifTanjim/nui.nvim",
-		"nvim-lua/plenary.nvim",
-		"sindrets/diffview.nvim",
-	},
-	cond = function()
-		return vim.fn.executable("go") > 0
-	end,
-	build = function()
-		require("gitlab.server").build(true)
-	end, -- Builds the Go binary
-	opts = {
-		discussion_tree = {
-			draft_mode = true,
-		},
-		popup = {
-			border = window.border,
-		},
-		discussion_signs = {
-			virtual_text = true,
-		},
-		keymaps = {
-			discussion_tree = {
-				toggle_node = "za",
-				toggle_all_discussions = "zA",
-			},
-			popup = {
-				perform_action = "w",
-				discard_changes = "<esc>",
-			},
-		},
-	},
-}

nvim/dot-config/nvim/lua/plugins/lualine.lua

@@ -1,24 +1,15 @@
 -- https://github.com/nvim-lualine/lualine.nvim
 
 local function get_schema()
-	if not (vim.bo.filetype == "yaml" or vim.bo.filetype == "json" or vim.bo.filetype == "toml") then
+	if vim.bo.filetype ~= "yaml" then
 		return ""
 	end
 
-	-- The provided get_current_schema function returns nonenil when no schema is known.
+	local schema = require("schema-companion.context").get_buffer_schema()
-	-- Instead we use a custom implemention that does not do that.
-	-- Also has the added benefit of giving more control over formatting
-	local schemas = require("schema-companion").get_matching_schemas()
-	if schemas == nil or #schemas == 0 then
-		return ""
-	end
-
-	schema = schemas[1]
 	if schema.name == "none" then
 		return ""
 	end
-
+	return schema.name
-	return ("%s%s"):format(schema.name, #schemas > 1 and (" (+%d)"):format(#schemas - 1) or "")
 end
 
 --- @module "lazy"
@@ -52,9 +43,7 @@ return {
 				"encoding",
 				{ "fileformat", icons_enabled = false },
 				"filetype",
-				{
+				get_schema,
-					get_schema,
-				},
 			},
 		},
 		inactive_sections = {

nvim/dot-config/nvim/lua/plugins/mason-tool-installer.lua

@@ -24,9 +24,8 @@ local ensure_installed = {
 		end,
 	},
 	"ruff",
-	"prettier",
+	"prettierd",
 	"stylua",
-	"eslint",
 }
 
 --- @module "lazy"

nvim/dot-config/nvim/lua/plugins/multicolumn.lua

@@ -1,41 +0,0 @@
--- https://github.com/aznhe21/fmbarina/multicolumn.nvim
-local function enforced(rulers, scope)
-	return {
-		rulers = rulers,
-		scope = scope or "window",
-		full_column = false,
-		to_line_end = true,
-		bg_color = "#691b1b",
-		fg_color = "#ffd8ad",
-	}
-end
-
---- @module "lazy"
---- @type LazySpec
-return {
-	"fmbarina/multicolumn.nvim",
-	event = { "BufReadPre", "BufNewFile" },
-	opts = {
-		base_set = {
-			full_column = true,
-		},
-		sets = {
-			python = enforced({ 89 }),
-			rust = enforced({ 101 }),
-			gitcommit = function(_, win)
-				local T = function(c, x, y)
-					if c then
-						return x
-					else
-						return y
-					end
-				end
-
-				return enforced(
-					{ T(vim.fn.line(".", win) == 1, 51, 73) },
-					T(vim.fn.line(".", win) == 1, "line", "window")
-				)
-			end,
-		},
-	},
-}

nvim/dot-config/nvim/lua/plugins/schema-companion.lua

@@ -1,6 +1,33 @@
 -- https://github.com/cenk1cenk2/schema-companion.nvim
 --- @module "schema-companion"
 --- @type schema_companion.Matcher
+local kubernetes = {
+	name = "Kubernetes",
+	match = function(bufnr)
+		local lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
+		local kind = false
+		local api_version = false
+
+		for _, line in ipairs(lines) do
+			if kind or vim.regex("^kind: .*$"):match_str(line) then
+				kind = true
+			end
+
+			if api_version or vim.regex("^apiVersion: .*$"):match_str(line) then
+				api_version = true
+			end
+
+			if kind and api_version then
+				return {
+					name = "Kubernetes",
+					uri = require("kubernetes").yamlls_schema(),
+				}
+			end
+		end
+
+		return nil
+	end,
+}
 
 --- @module "lazy"
 --- @type LazySpec
@@ -8,23 +35,26 @@ return {
 	"cenk1cenk2/schema-companion.nvim",
 	dependencies = {
 		"nvim-lua/plenary.nvim",
+		"nvim-telescope/telescope.nvim",
 		"diogo464/kubernetes.nvim",
 	},
 	keys = {
 		{
 			"<leader>ys",
 			function()
-				local schemas = require("schema-companion").get_matching_schemas()
+				require("telescope").extensions.schema_companion.select_schema()
-				if schemas == nil or #schemas == 0 or (#schemas == 1 and schemas[1].name == "none") then
-					print("No matching schemas")
-				else
-					require("schema-companion").select_matching_schema()
-				end
 			end,
-			desc = "Select schema",
+			desc = "Yaml schema",
+			ft = "yaml",
 		},
 	},
 	--- @module "schema-companion"
 	--- @type schema_companion.Config
-	opts = {},
+	opts = {
+		enable_telescope = true,
+		matchers = {
+			kubernetes,
+		},
+		schemas = {},
+	},
 }

nvim/dot-config/nvim/lua/plugins/telescope.lua

@@ -37,9 +37,6 @@ return {
 					["ui-select"] = {
 						require("telescope.themes").get_dropdown(),
 					},
-					smart_open = {
-						match_algorithm = "fzf",
-					},
 				},
 			}
 		end,
@@ -117,25 +114,24 @@ return {
 		end,
 	},
 	{
-		"nvim-telescope/telescope-fzf-native.nvim",
+		"nvim-telescope/telescope-fzy-native.nvim",
-		build = "make",
 		dependencies = {
 			"nvim-telescope/telescope.nvim",
 		},
 		config = function()
-			require("telescope").load_extension("fzf")
+			require("telescope").load_extension("fzy_native")
 		end,
 	},
 	{
 		"danielfalk/smart-open.nvim",
-		branch = "0.3.x",
+		branch = "0.2.x",
 		config = function()
 			require("telescope").load_extension("smart_open")
 		end,
 		dependencies = {
 			"kkharji/sqlite.lua",
 			"nvim-telescope/telescope.nvim",
-			"nvim-telescope/telescope-fzf-native.nvim",
+			"nvim-telescope/telescope-fzy-native.nvim",
 			{
 				"ellisonleao/gruvbox.nvim",
 				opts = function(_, opts)

nvim/dot-config/nvim/lua/plugins/which-key.lua

@@ -3,9 +3,7 @@ local window = require("symbols.window")
 --- @module "lazy"
 --- @type LazySpec
 return {
-	-- "folke/which-key.nvim",
+	"folke/which-key.nvim",
-	"cameronr/which-key.nvim",
-	branch = "winborder-support",
 	event = "VeryLazy",
 	--- @module "which-key"
 	--- @type wk.Opts

nvim/dot-config/nvim/queries/yaml/injections.scm

@@ -1,17 +0,0 @@
-; extends
-; Dockerfile snippets for AIM pipeline
-(block_mapping_pair
-  key: (flow_node) @_template
-  (#eq? @_template "template")
-  value: (block_node
-    (block_scalar) @injection.content
-    (#set! injection.language "dockerfile")
-    (#offset! @injection.content 0 1 0 0)))
-
-(block_mapping_pair
-  key: (flow_node) @_template
-  (#eq? @_template "entrypoint")
-  value: (block_node
-    (block_scalar) @injection.content
-    (#set! injection.language "bash")
-    (#offset! @injection.content 0 1 0 0)))

sesh/dot-config/sesh/sesh.toml

@@ -1,7 +1,10 @@
-# Scratch sessions rename themselves to something unique
+# Hide all scratch sessions
+blacklist = ["scratch-*"]
+
+# Scratch sessions rename themselves to something unique and are hidden from the overview
 [[session]]
 name = "scratch"
-startup_command = "tmux rename-session scratch-$(echo -n $(date) | sha256sum | cut -c1-4) && clear"
+startup_command = "tmux rename-session scratch-$(echo -n $(date) | sha256sum | cut -c1-4) && tmux set detach-on-destroy on && clear"
 
 [[session]]
 name = "automation_rs"

tmux/dot-tmux.conf

@@ -14,8 +14,6 @@ set -g history-limit 5000
 
 set -g detach-on-destroy off  # don't exit from tmux when closing a session
 
-set -g @fzf-url-fzf-options '-p'
-
 # Setup vi-mode with better keybindings
 # TODO: Escape does not work properly for leaving
 setw -g mode-keys vi

zsh/.stow-local-ignore

@@ -1,3 +1,2 @@
 ohmyzsh
 custom
-fzf-git.sh

zsh/custom/completions/_tula

@@ -1,7 +0,0 @@
-#compdef tula
-
-_tula_completion() {
-  eval $(env _TYPER_COMPLETE_ARGS="${words[1,$CURRENT]}" _TULA_COMPLETE=complete_zsh tula)
-}
-
-compdef _tula_completion tula

zsh/dot-zshrc

@@ -15,19 +15,17 @@ zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 # ENABLE_CORRECTION="true"
 COMPLETION_WAITING_DOTS="true"
 ZSH_DISABLE_COMPFIX="true"
-ZOXIDE_CMD_OVERRIDE="cd"
 
 plugins=(
 	git
 	zsh-autosuggestions
 	# Disabled because the highlighting conflicts with autosuggestions
 	# history-substring-search
-	zsh-vi-mode
+	vi-mode
 	colored-man-pages
 	command-not-found
 	zsh-autopair
 	fast-syntax-highlighting
-	zoxide
 )
 
 bindkey -M vicmd "k" up-line-or-beginning-search
@@ -39,27 +37,11 @@ HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_TIMEOUT=3
 
 ZSH_AUTOSUGGEST_STRATEGY=(history completion)
 
-# Default to insert mode
+VI_MODE_RESET_PROMPT_ON_MODE_CHANGE=true
-ZVM_LINE_INIT_MODE=i
+VI_MODE_SET_CURSOR=true
-# Enable system clipboard
-ZVM_SYSTEM_CLIPBOARD_ENABLED=true
-# Make p and P use the system clipboard, instead of CUTBUFFER,
-# without this you need gp and gP
-function zvm_after_lazy_keybindings() {
-  bindkey -M vicmd 'p' zvm_paste_clipboard_after
-  bindkey -M vicmd 'P' zvm_paste_clipboard_before
-  bindkey -M visual 'p' zvm_visual_paste_clipboard
-  bindkey -M visual 'P' zvm_visual_paste_clipboard
-}
-
-# Fix autopair and zsh-vi-mode compatibility
-AUTOPAIR_INHIBIT_INIT=1
-zvm_after_init_commands+=('autopair-init')
-
 # Might cause issues?
 KEYTIMEOUT=1
 
-fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/completions
 fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
 autoload -U compinit && compinit
 source "$ZSH/oh-my-zsh.sh"
@@ -73,7 +55,7 @@ export EDITOR=nvim
 
 alias cl="clear"
 
-if (( $+commands[bat] )); then
+if (( $+commands[hash] )); then
 	export BAT_THEME="gruvbox-dark"
 	alias cat=bat
 fi
@@ -105,17 +87,12 @@ if (( $+commands[devcontainer] )); then
 	}
 fi
 
-export PNPM_HOME="/home/tim/.local/share/pnpm"
+if (( $+commands[pnpm] )); then
-if [ -d "$PNPM_HOME" ]; then
+	export PNPM_HOME="/home/tim/.local/share/pnpm"
 	case ":$PATH:" in
 	  *":$PNPM_HOME:"*) ;;
 	  *) export PATH="$PNPM_HOME:$PATH" ;;
 	esac
-else
-	unset PNPM_HOME
-fi
-if (( $+commands[pnpm] )); then
-	source <(pnpm completion zsh)
 fi
 
 export FZF_DEFAULT_OPTS='--tmux'
@@ -126,17 +103,14 @@ export FZF_DEFAULT_OPTS=$FZF_DEFAULT_OPTS'
   --color=border:#7c6f64,label:#7c6f64
   --border="sharp" --border-label-pos="0" --preview-window="border-sharp"
   --prompt="> " --marker="◆" --pointer=">" --separator="─"
-  --scrollbar="│" --info="right"
+  --scrollbar="│" --info="right"'
-  --layout="default"'
 
 if (( $+commands[fd] )); then
 	export FZF_DEFAULT_COMMAND="fd --type f --strip-cwd-prefix"
 	export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 fi
-
 if (( $+commands[fzf] )); then
-	# Fix fzf keybind after zsh-vi-mode has loaded
+	source <(fzf --zsh)
-	zvm_after_init_commands+=('source <(fzf --zsh)')
 
 	if (( $+commands[paru] )); then
 		function pi {
@@ -145,10 +119,29 @@ if (( $+commands[fzf] )); then
 	fi
 fi
 
+export _ZO_FZF_OPTS="--tmux"
+if (( $+commands[zoxide] )); then
+	eval "$(zoxide init zsh --cmd cd)"
+fi
+
+# Generate missing text objects
+autoload -Uz select-bracketed select-quoted
+zle -N select-quoted
+zle -N select-bracketed
+for km in viopp visual; do
+  bindkey -M $km -- '-' vi-up-line-or-history
+  for c in {a,i}${(s..)^:-\'\"\`\|,./:;=+@}; do
+    bindkey -M $km $c select-quoted
+  done
+  for c in {a,i}${(s..)^:-'()[]{}<>bB'}; do
+    bindkey -M $km $c select-bracketed
+  done
+done
+
 ZSH_TMUX_AUTOSTART=true
 if (( $+commands[tmux] )); then
 	if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && -z "$INSIDE_EMACS" && -z "$EMACS" && -z "$VIM" && -z "$INTELLIJ_ENVIRONMENT_READER" && -z "$ZED_TERM" ]]; then
-		if (( $+commands[sesh] )) && (( $+commands[sesh-select] )); then
+		if (( $+commands[sesh] )); then
 			sesh-select
 		else
 			tmux new-session