Switched to blink.cmp

.gitmodules

@@ -7,12 +7,3 @@
 [submodule "tmux/tpm"]
 	path = tmux/tpm
 	url = https://github.com/tmux-plugins/tpm
-[submodule "zsh/custom/plugins/zsh-autopair"]
-	path = zsh/custom/plugins/zsh-autopair
-	url = https://github.com/hlissner/zsh-autopair
-[submodule "zsh/custom/plugins/fast-syntax-highlighting"]
-	path = zsh/custom/plugins/fast-syntax-highlighting
-	url = https://github.com/zdharma-continuum/fast-syntax-highlighting.git
-[submodule "zsh/custom/plugins/zsh-completions"]
-	path = zsh/custom/plugins/zsh-completions
-	url = https://github.com/zsh-users/zsh-completions.git

README.md

@@ -1,20 +0,0 @@
-## Tools
-
-### Core tools
-
-```
-bat
-fd
-fzf
-git-delta
-paru
-rg
-zoxide
-```
-
-### Useful
-
-```
-jq
-git-cliff
-```

alacritty/dot-config/alacritty/alacritty.toml

@@ -3,10 +3,10 @@
 TERM = "xterm-256color"
 
 [font]
-size = 10
+size = 9.8
 
 [font.normal]
-family = "Hack Nerd Font"
+family = "Hack Nerd Font Mono"
 
 [window]
 decorations = "none"

git-alten/dot-gitconfig

@@ -1,4 +1,3 @@
 [include]
-	path = ~/.dotfiles/git/configs/common.gitconfig
+	path = ~/.dotfiles/git/profiles/common
-
+	path = ~/.dotfiles/git/profiles/ALTEN
-	path = ~/.dotfiles/git/profiles/ALTEN.gitconfig

git-alten/dot-local

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

git/.stow-local-ignore

@@ -1,3 +1,2 @@
 gitignore
 profiles
-configs

git/configs/delta.gitconfig

@@ -1,54 +0,0 @@
-[delta "gruvmax-fang"]
-    # author: https://github.com/maxfangx
-	# Modified by: Dreaded_X
-    # General appearance
-    dark = true
-    syntax-theme = gruvbox-dark
-    # File
-    file-style = "#FFFFFF" bold
-    file-added-label = [+]
-    file-copied-label = [==]
-    file-modified-label = [*]
-    file-removed-label = [-]
-    file-renamed-label = [->]
-    file-decoration-style = "#434C5E" ul
-    file-decoration-style = "#84786A" ul
-    # No hunk headers
-    hunk-header-style = omit
-    # Line numbers
-    line-numbers = true
-    line-numbers-left-style = "#84786A"
-    line-numbers-right-style = "#84786A"
-    line-numbers-minus-style = "#A02A11"
-    line-numbers-plus-style = "#479B36"
-    line-numbers-zero-style = "#84786A"
-    line-numbers-left-format = " {nm:>3} │"
-    line-numbers-right-format = " {np:>3} │"
-    # Diff contents
-    inline-hint-style = syntax
-    minus-non-emph-style = syntax auto
-    plus-non-emph-style = syntax auto
-    whitespace-error-style = "#FB4934" reverse
-    # Blame
-    blame-code-style = syntax
-    # Merge conflicts
-    merge-conflict-begin-symbol = ⌃
-    merge-conflict-end-symbol = ⌄
-    merge-conflict-ours-diff-header-style = "#FABD2F" bold
-    merge-conflict-theirs-diff-header-style = "#FABD2F" bold overline
-    merge-conflict-ours-diff-header-decoration-style = ''
-    merge-conflict-theirs-diff-header-decoration-style = ''
-
-[core]
-	pager = delta
-
-[interactive]
-	diffFilter = delta --color-only
-
-[delta]
-	features = gruvmax-fang
-	navigate = true
-	side-by-side = true
-
-[merge]
-	conflictstyle = zdiff3

git/configs/lfs.gitconfig

@@ -1,5 +0,0 @@
-[filter "lfs"]
-	process = git-lfs filter-process
-	required = true
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f

git/dot-gitconfig

@@ -1,7 +1,11 @@
 [include]
-	path = ~/.dotfiles/git/configs/common.gitconfig
+	path = ~/.dotfiles/git/profiles/common
-
+	path = ~/.dotfiles/git/profiles/Dreaded_X
-	path = ~/.dotfiles/git/profiles/Dreaded_X.gitconfig
 
 [includeIf "gitdir:~/Projects/ALTEN/"]
-	path = ~/.dotfiles/git/profiles/ALTEN.gitconfig
+	path = ~/.dotfiles/git/profiles/ALTEN
+[filter "lfs"]
+	process = git-lfs filter-process
+	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f

git/dot-local/bin/git-fixup

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-TARGET=$1
-
-
-if [ -z "$TARGET" ]; then
-	if hash fzf 2>/dev/null; then
-		TARGET=$(git log -n 50 --pretty=format:'%h %s' --no-merges | fzf --border-label=' Select commit ' | cut -c -7 )
-	else
-		echo "Not installed: fzf"
-		exit -1
-	fi
-fi
-
-if [ -z "$TARGET" ]; then
-	echo "No target specified"
-	exit -1
-fi
-
-git commit --fixup=$TARGET ${@:2} && GIT_SEQUENCE_EDITOR=true git rebase -i --autostash --autosquash $TARGET^

git/profiles/common

@@ -1,7 +1,3 @@
-[include]
-	path = ~/.dotfiles/git/configs/lfs.gitconfig
-	path = ~/.dotfiles/git/configs/delta.gitconfig
-
 [push]
 	default = simple
 
@@ -24,9 +20,4 @@
 	tool = nvimdiff
 
 [init]
-	defaultBranch = main
+	defaultBranch = master
-
-[rebase]
-  autosquash = true
-  autostash = true
-  updateRefs = true

helpers/legacy_ubuntu_nvim.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-set -e
-
-# Install additional dependencies
-sudo apt-get install fuse libfuse2 unzip ripgrep python3-venv xclip -y --no-install-recommends
-
-# Install new version of node
-curl -fsSL https://deb.nodesource.com/setup_23.x -o /tmp/nodesource_setup.sh
-sudo -E bash /tmp/nodesource_setup.sh
-sudo apt-get install -y nodejs
-
-# Install new version of neovim
-sudo rm -rf /usr/local/bin/nvim
-sudo wget https://github.com/neovim/neovim-releases/releases/download/v0.11.1/nvim-linux-x86_64.appimage -O /usr/local/bin/nvim
-sudo chmod +x /usr/local/bin/nvim
-
-# Get latest version of dotfiles
-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/init.lua

@@ -1,3 +1,8 @@
+-- Basic vim config stuff
+require("keymaps")
+require("options")
+require("autocmds")
+
 -- Install lazy package manager
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
@@ -12,13 +17,6 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
--- Setup
-require("keymaps")
-require("options")
-require("autocmds")
-require("lsp")
-
--- Configure plugins
 require("lazy").setup({
 	{ import = "themes" },
 	{ import = "plugins" },
@@ -28,9 +26,6 @@ require("lazy").setup({
 			"gruvbox",
 		},
 	},
-	change_detection = {
-		notify = false,
-	},
 	rocks = {
 		enabled = false,
 	},
@@ -39,3 +34,24 @@ require("lazy").setup({
 		backdrop = 100,
 	},
 })
+
+local lsp = require("tools.lsp")
+for _, tool in pairs(lsp) do
+	if type(tool) == "table" then
+		local name = tool[1]
+
+		-- Apply additional config if specified
+		local config = tool[2]
+		if config ~= nil then
+			vim.lsp.config(name, config)
+		end
+
+		-- System LSP are not managed by mason and need to be enabled manually
+		if
+			(type(tool.system) == "boolean" and tool.system and vim.fn.executable(name) > 0)
+			or (type(tool.system) == "string" and vim.fn.executable(tool.system) > 0)
+		then
+			vim.lsp.enable(name)
+		end
+	end
+end

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

@@ -1,51 +1,48 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "actions-preview.nvim": { "branch": "master", "commit": "36513ad213855d497b7dd3391a24d1d75d58e36f" },
+  "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
-  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "bufresize.nvim": { "branch": "master", "commit": "3b19527ab936d6910484dcc20fb59bdb12322d8b" },
-  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
+  "conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
-  "crates.nvim": { "branch": "main", "commit": "afcd1cc3eeceb5783676fc8464389b9216a29d05" },
+  "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
-  "eyeliner.nvim": { "branch": "main", "commit": "8f197eb30cecdf4c2cc9988a5eecc6bc34c0c7d6" },
-  "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
+  "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" },
-  "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
+  "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
   "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
-  "inc-rename.nvim": { "branch": "main", "commit": "8ae25b35ae16ca4bd5de3d3c472eec3b574018d4" },
+  "inc-rename.nvim": { "branch": "main", "commit": "2eaff20526ff6101337b84f4b0d238c11f47d7f4" },
-  "kubernetes.nvim": { "branch": "main", "commit": "44daf998345628a1a7034e3aaa31f4e05e4dde7c" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "kubernetes.nvim": { "branch": "main", "commit": "1a08abc6c0694f0d1f5d6725bfa7a88daf0f7246" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
+  "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" },
+  "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
+  "mason-conform.nvim": { "branch": "main", "commit": "f3b96fa2217fcb1513301eefbe10ea0e765e33eb" },
-  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "d24b3f1612e53f9d54d866b16bedab51813f2bf1" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" },
-  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
+  "neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
+  "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
+  "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
   "nvim-dap": { "branch": "master", "commit": "b0f983507e3702f073bfe1516846e58b56d4e42f" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" },
+  "nvim-lspconfig": { "branch": "master", "commit": "3ea99227e316c5028f57a4d86a1a7fd01dd876d0" },
-  "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
+  "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-treesitter": { "branch": "main", "commit": "c1dfc39285e4a11983dfbe556fb0be7f2a749977" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "404502e607c3b309e405be9112c438c721153372" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "fa32a45fdbab9c9c3bda9ecec9b12dddb221b927" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
   "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "ros-nvim": { "branch": "main", "commit": "1ad64cd3a1e144dfea67890845f9da2e82d96900" },
+  "schemastore.nvim": { "branch": "main", "commit": "0098dde21296a454ae1426f9ac47340dd38c27ce" },
-  "schema-companion.nvim": { "branch": "main", "commit": "e94f5f8439705d772363817c9d2c6c9fc7562bd0" },
+  "smart-splits.nvim": { "branch": "master", "commit": "5ef94ca23b28148187846fc46f10184aad4d17b0" },
-  "schemastore.nvim": { "branch": "main", "commit": "d522e3ed6ed2c7bed7ebe1e42615e79b3aabfe65" },
-  "scrollEOF.nvim": { "branch": "master", "commit": "aeedfad14e4a0cfa31b44b531c1ad8fd4696b551" },
-  "smart-open.nvim": { "branch": "0.3.x", "commit": "e7f27218bd43de5262d3e8e3e84a135737ca6942" },
-  "smart-splits.nvim": { "branch": "master", "commit": "51e400b0bb6cbfd48e56d1baca250f34028cf1d3" },
-  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
-  "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
-  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "todo-comments.nvim": { "branch": "main", "commit": "f8bd47e4bc15e3aa7c784b12e68b6dd6e97caea2" },
   "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
-  "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "74163ac321c7d208a5bb9cdf8964114c7064d6c7" },
+  "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
-  "undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
-  "which-key.nvim": { "branch": "winborder-support", "commit": "ab1a3b0d3005a95507ba6c18b96531d430370885" }
+  "yaml-companion.nvim": { "branch": "main", "commit": "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0" }
 }

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

@@ -1,9 +0,0 @@
-return {
-	settings = {
-		basedpyright = {
-			analysis = {
-				typeCheckingMode = "standard",
-			},
-		},
-	},
-}

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

@@ -1,3 +0,0 @@
-return {
-	cmd = { "clangd", "--offset-encoding=utf-16", "--clang-tidy" },
-}

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

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

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

@@ -1,23 +0,0 @@
-return {
-	settings = {
-		Lua = {
-			workspace = {
-				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/rust_analyzer.lua

@@ -1,9 +0,0 @@
-return {
-	settings = {
-		["rust-analyzer"] = {
-			check = {
-				command = "clippy",
-			},
-		},
-	},
-}

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/typos_lsp.lua

@@ -1,5 +0,0 @@
-return {
-	init_options = {
-		diagnosticSeverity = "Hint",
-	},
-}

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

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

nvim/dot-config/nvim/lua/autocmds.lua

@@ -1,3 +1,5 @@
+local window = require("symbols.window")
+
 -- Highlight on yank
 vim.api.nvim_create_autocmd("TextYankPost", {
 	callback = function()
@@ -24,3 +26,141 @@ vim.api.nvim_create_autocmd({ "InsertEnter", "WinLeave" }, {
 		end
 	end,
 })
+
+-- Setup lsp keybindings
+vim.api.nvim_create_autocmd("LspAttach", {
+	callback = function(event)
+		-- Symbols
+		vim.keymap.set("n", "gd", vim.lsp.buf.definition, { desc = "Goto definition" })
+		vim.keymap.set("n", "gD", vim.lsp.buf.declaration, { desc = "Goto declaration" })
+		vim.keymap.set("n", "<leader>D", vim.lsp.buf.type_definition, { desc = "Type definition" })
+
+		if pcall(require, "telescope") then
+			vim.keymap.set("n", "gr", require("telescope.builtin").lsp_references, { desc = "Goto references" })
+			vim.keymap.set(
+				"n",
+				"gI",
+				require("telescope.builtin").lsp_implementations,
+				{ desc = "Goto implementation" }
+			)
+			vim.keymap.set(
+				"n",
+				"<leader>ds",
+				require("telescope.builtin").lsp_document_symbols,
+				{ desc = "Document symbols" }
+			)
+			vim.keymap.set(
+				"n",
+				"<leader>ws",
+				require("telescope.builtin").lsp_dynamic_workspace_symbols,
+				{ desc = "Workspace symbols" }
+			)
+		end
+
+		-- Diagnostics
+		vim.keymap.set("n", "[d", function()
+			vim.diagnostic.jump({ count = -1 })
+		end, { desc = "Go to previous diagnostic message" })
+		vim.keymap.set("n", "]d", function()
+			vim.diagnostic.jump({ count = 1 })
+		end, { desc = "Go to next diagnostic message" })
+		-- vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
+		vim.keymap.set("n", "<leader>e", function()
+			if vim.diagnostic.config().virtual_lines then
+				vim.diagnostic.config({ virtual_lines = false })
+			else
+				vim.diagnostic.config({
+					virtual_lines = {
+						current_line = true,
+						format = vim.diagnostic.config().virtual_text.format,
+					},
+				})
+			end
+		end, { desc = "Show virtual diagnostic line" })
+
+		-- Helpers
+		vim.keymap.set("n", "<leader>rn", function()
+			return ":IncRename " .. vim.fn.expand("<cword>")
+		end, { buffer = event.buf, expr = true, desc = "Rename" })
+		vim.keymap.set(
+			"n",
+			"<leader>ca",
+			vim.lsp.buf.code_action,
+			{ buffer = event.buf, desc = "Code actions", remap = true }
+		)
+
+		-- Documentation
+		vim.keymap.set("n", "K", function()
+			vim.lsp.buf.hover({ border = window.border })
+		end, { desc = "Hover Documentation" })
+		-- vim.keymap.set("n", "<C-k>", function()
+		-- 	vim.lsp.buf.signature_help({ border = border })
+		-- end, { desc = "Signature Documentation" })
+	end,
+})
+
+-- Setup cursor hover symbol highlight
+vim.api.nvim_create_autocmd("LspAttach", {
+	callback = function(event)
+		local client = vim.lsp.get_client_by_id(event.data.client_id)
+		if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then
+			local lsp_hover_hl = vim.api.nvim_create_augroup("LspHoverHighlight", { clear = false })
+			vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
+				buffer = event.buf,
+				group = lsp_hover_hl,
+				callback = vim.lsp.buf.document_highlight,
+			})
+
+			vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
+				buffer = event.buf,
+				group = lsp_hover_hl,
+				callback = vim.lsp.buf.clear_references,
+			})
+
+			vim.api.nvim_create_autocmd("LspDetach", {
+				group = vim.api.nvim_create_augroup("LspHoverHighlightDetach", { clear = true }),
+				callback = function(event2)
+					vim.lsp.buf.clear_references()
+					vim.api.nvim_clear_autocmds({ group = lsp_hover_hl, buffer = event2.buf })
+				end,
+			})
+		end
+	end,
+})
+
+-- Setup cursor hover symbol highlight
+vim.api.nvim_create_autocmd("LspAttach", {
+	callback = function(event)
+		local client = vim.lsp.get_client_by_id(event.data.client_id)
+		if client and client.server_capabilities.semanticTokensProvider then
+			client.server_capabilities.semanticTokensProvider = nil
+		end
+	end,
+})
+
+--
+vim.api.nvim_create_autocmd("CursorMoved", {
+	callback = function()
+		vim.diagnostic.config({ virtual_lines = false })
+	end,
+})
+
+-- Auto install treesitter parser and start them
+vim.api.nvim_create_autocmd("FileType", {
+	desc = "Enable Treesitter",
+	group = vim.api.nvim_create_augroup("enable_treesitter", {}),
+	callback = function(event)
+		local has_treesitter, treesitter = pcall(require, "nvim-treesitter")
+		if has_treesitter then
+			local language = vim.treesitter.language.get_lang(event.match)
+			treesitter.install(language):await(function()
+				if pcall(vim.treesitter.start) then
+					-- Use Treesitter indentation and folds.
+					vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+					vim.wo.foldmethod = "expr"
+					vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+				end
+			end)
+		end
+	end,
+})

nvim/dot-config/nvim/lua/keymaps.lua

@@ -7,6 +7,12 @@ vim.keymap.set({ "n", "v" }, "<Space>", "<Nop>", { noremap = true, silent = true
 vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
+-- Keybinds for resizing windows
+vim.keymap.set("n", "<S-Up>", "<cmd>resize +2<CR>")
+vim.keymap.set("n", "<S-Down>", "<cmd>resize -2<CR>")
+vim.keymap.set("n", "<S-Left>", "<cmd>vertical resize -2<CR>")
+vim.keymap.set("n", "<S-Right>", "<cmd>vertical resize +2<CR>")
+
 -- Some nice adjustments
 vim.keymap.set("n", "<C-d>", "<C-d>zz")
 vim.keymap.set("n", "<C-u>", "<C-u>zz")
@@ -15,16 +21,3 @@ vim.keymap.set("n", "N", "Nzz")
 
 -- Clear search highlight by pressing esc
 vim.keymap.set("n", "<Esc>", "<cmd>nohlsearch<CR>")
-
-vim.api.nvim_create_autocmd("FileType", {
-	pattern = { "rust" },
-	callback = function(args)
-		local command = {
-			rust = "cargo run",
-		}
-		vim.keymap.set("n", "<F5>", function()
-			vim.system({ "tmux", "send-keys", "-t", ":shell", "c-u", command[args.match], "Enter" })
-			vim.system({ "tmux", "select-window", "-t", ":shell" })
-		end, { buffer = true })
-	end,
-})

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

@@ -1,157 +0,0 @@
-local diagnostic = require("symbols.diagnostic")
-local methods = vim.lsp.protocol.Methods
-
-local map = function(keys, func, desc, mode, bufnr)
-	mode = mode or "n"
-	vim.keymap.set(mode, keys, func, { desc = desc, buffer = bufnr })
-end
-
--- General keymaps
-map("[d", function()
-	vim.diagnostic.jump({ count = -1 })
-end, "Go to previous diagnostic message")
-map("]d", function()
-	vim.diagnostic.jump({ count = 1 })
-end, "Go to next diagnostic message")
-
-map("[e", function()
-	vim.diagnostic.jump({ count = -1, severity = vim.diagnostic.severity.ERROR })
-end, "Go to previous error message")
-map("]e", function()
-	vim.diagnostic.jump({ count = 1, severity = vim.diagnostic.severity.ERROR })
-end, "Go to next error message")
-
-map("<leader>e", vim.diagnostic.open_float, "Open floating diagnostic message")
-
-map("<leader>th", function()
-	vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
-end, "Toggle inlay hints")
-
-map("gra", function()
-	require("actions-preview").code_actions()
-end, "Code actions", { "n", "x" })
-map("grD", vim.lsp.buf.declaration, "Goto declaration")
-map("grd", function()
-	require("telescope.builtin").lsp_definitions({ jump_type = "never" })
-end, "Goto definition")
-
-map("grt", function()
-	require("telescope.builtin").lsp_type_definitions()
-end, "Type definition")
-map("grr", function()
-	require("telescope.builtin").lsp_references()
-end, "Goto references")
-map("gri", function()
-	require("telescope.builtin").lsp_implementations()
-end, "Goto implementation")
-
-map("<leader>ss", function()
-	require("telescope.builtin").lsp_document_symbols()
-end, "Document symbols")
-map("<leader>sS", function()
-	require("telescope.builtin").lsp_dynamic_workspace_symbols()
-end, "Workspace symbols")
-
--- Provide a placeholder rename keymap, otherwise the rename appears to works until you hit enter at which point it will fail
-map("grn", function()
-	vim.api.nvim_echo({ { "Rename are not available in current buffer" } }, true, { err = true })
-end, "Rename")
-
----@param client vim.lsp.Client
----@param bufnr integer
-local function on_attach(client, bufnr)
-	-- Setup actual rename keymap if it is available
-	if client:supports_method(methods.textDocument_rename, bufnr) then
-		vim.keymap.set("n", "grn", function()
-			return ":IncRename " .. vim.fn.expand("<cword>")
-		end, { buffer = bufnr, expr = true, desc = "Rename" })
-	end
-
-	-- Disable lsp based syntax highlighting, I don't like it
-	-- TODO: Switch to this once it is available
-	-- vim.lsp.document_color.enable(false, bufnr)
-	if client.server_capabilities.semanticTokensProvider then
-		client.server_capabilities.semanticTokensProvider = nil
-	end
-
-	-- Highlight references under cursor
-	if client:supports_method(methods.textDocument_documentHighlight) then
-		local lsp_hover_hl = vim.api.nvim_create_augroup("LspHoverHighlight", { clear = false })
-		vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI" }, {
-			buffer = bufnr,
-			group = lsp_hover_hl,
-			callback = vim.lsp.buf.document_highlight,
-		})
-
-		vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
-			buffer = bufnr,
-			group = lsp_hover_hl,
-			callback = vim.lsp.buf.clear_references,
-		})
-	end
-end
-
-vim.diagnostic.config({
-	severity_sort = true,
-	signs = {
-		numhl = {
-			[vim.diagnostic.severity.ERROR] = "DiagnosticNumError",
-			[vim.diagnostic.severity.WARN] = "DiagnosticNumWarn",
-			[vim.diagnostic.severity.HINT] = "DiagnosticNumHint",
-			[vim.diagnostic.severity.INFO] = "DiagnosticNumInfo",
-		},
-		text = {
-			[vim.diagnostic.severity.ERROR] = "",
-			[vim.diagnostic.severity.WARN] = "",
-			[vim.diagnostic.severity.HINT] = "",
-			[vim.diagnostic.severity.INFO] = "",
-		},
-	},
-	float = {
-		severity_sort = false,
-		header = "",
-		suffix = function(d)
-			local code = d.code and string.format(" (%s)", d.code) or ""
-
-			return string.format("%s [%s]", code, d.source), "NormalFloat"
-		end,
-	},
-	virtual_text = {
-		prefix = function(d)
-			return diagnostic[d.severity]
-		end,
-		virt_text_pos = "eol_right_align",
-	},
-})
-
-local register_capability = vim.lsp.handlers[methods.client_registerCapability]
-vim.lsp.handlers[methods.client_registerCapability] = function(err, res, ctx)
-	local client = vim.lsp.get_client_by_id(ctx.client_id)
-	if not client then
-		return
-	end
-
-	on_attach(client, vim.api.nvim_get_current_buf())
-
-	return register_capability(err, res, ctx)
-end
-
-vim.api.nvim_create_autocmd("LspAttach", {
-	desc = "Configure LSP keymaps",
-	callback = function(args)
-		local client = vim.lsp.get_client_by_id(args.data.client_id)
-		if not client then
-			return
-		end
-
-		on_attach(client, args.buf)
-	end,
-})
-
--- Manually enable lsps, 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/options.lua

@@ -1,4 +1,5 @@
-local window = require("symbols.window")
+local diagnostic = require("symbols.diagnostic")
+local border = require("symbols.window").border
 
 -- Set highlight on search
 vim.o.hlsearch = true
@@ -67,5 +68,21 @@ vim.o.list = true
 -- Fold settings
 vim.o.foldlevelstart = 99
 
--- Windows borders
+-- LSP config
-vim.o.winborder = window.border
+vim.diagnostic.config({
+	severity_sort = true,
+	signs = {
+		text = {
+			[vim.diagnostic.severity.ERROR] = diagnostic.error,
+			[vim.diagnostic.severity.WARN] = diagnostic.warn,
+			[vim.diagnostic.severity.HINT] = diagnostic.hint,
+			[vim.diagnostic.severity.INFO] = diagnostic.info,
+		},
+	},
+	virtual_text = {
+		virt_text_pos = "eol_right_align",
+		format = function(d)
+			return ("%s [%s]"):format(d.message, d.source)
+		end,
+	},
+})

nvim/dot-config/nvim/lua/plugins/actions-preview.lua

@@ -1,28 +0,0 @@
--- https://github.com/aznhe21/actions-preview.nvim
---- @module "lazy"
---- @type LazySpec
-return {
-	"aznhe21/actions-preview.nvim",
-	opts = function()
-		local hl = require("actions-preview.highlight")
-		return {
-			backend = { "telescope" },
-			highlight_command = {
-				hl.delta(),
-			},
-			telescope = {
-				sorting_strategy = "ascending",
-				layout_strategy = "vertical",
-				layout_config = {
-					width = 0.8,
-					height = 0.9,
-					prompt_position = "top",
-					preview_cutoff = 20,
-					preview_height = function(_, _, max_lines)
-						return max_lines - 15
-					end,
-				},
-			},
-		}
-	end,
-}

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

@@ -1,31 +1,6 @@
--- https://github.com/altermo/ultimate-autopair.nvim
+-- https://github.com/windwp/nvim-autopairs
---- @module "lazy"
---- @type LazySpec
 return {
-	"altermo/ultimate-autopair.nvim",
+	"windwp/nvim-autopairs",
-	event = { "InsertEnter", "CmdlineEnter" },
+	event = "InsertEnter",
-	branch = "v0.6",
+	config = true,
-	--- @module "ultimate-autopair"
-	--- @type prof.def.conf
-	opts = {
-		fastwarp = {
-			faster = true,
-		},
-		-- Fix single quotes in rust
-		config_internal_pairs = {
-			{
-				"'",
-				"'",
-				multiline = false,
-				nft = {},
-				suround = true,
-				cond = function(fn)
-					if fn.get_ft() ~= "rust" then
-						return true
-					end
-					return not fn.in_node({ "bounded_type", "reference_type", "type_arguments", "type_parameters" })
-				end,
-			},
-		},
-	},
 }

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

@@ -1,37 +1,27 @@
--- https://github.com/saghen/blink.cmp
+local window = require("symbols.window")
---- @module "lazy"
---- @type LazySpec
 return {
 	"saghen/blink.cmp",
+	-- optional: provides snippets for the snippet source
 	dependencies = { "rafamadriz/friendly-snippets" },
-	event = "InsertEnter",
 
 	-- use a release tag to download pre-built binaries
 	version = "1.*",
 
-	--- @module "blink-cmp"
+	---@module 'blink.cmp'
-	--- @type blink.cmp.Config
+	---@type blink.cmp.Config
 	opts = {
+		-- See :h blink-cmp-config-keymap for defining your own keymap
+		-- keymap = { preset = "default" },
 		keymap = {
 			preset = "default",
+			-- ["<C-u>"] = {function(cmp) cmp.scroll_documentation_up(4) end},
+			-- ["<C-d>"] = {function(cmp) cmp.scroll_documentation_down(4) end},
 			["<C-space>"] = { "show", "show_documentation", "hide_documentation" },
 			["<C-u>"] = { "scroll_documentation_up" },
 			["<C-d>"] = { "scroll_documentation_down" },
 
 			["<CR>"] = { "accept", "fallback" },
-			["<Esc>"] = {
+			["<Esc>"] = { "cancel", "fallback" },
-				function(cmp)
-					if cmp.is_visible() then
-						cmp.cancel()
-						if cmp.get_selected_item_idx() ~= nil or cmp.snippet_active() then
-							return true
-						end
-					elseif cmp.snippet_active() then
-						vim.snippet.stop()
-					end
-				end,
-				"fallback",
-			},
 
 			["<Tab>"] = { "select_next", "snippet_forward", "fallback" },
 			["<S-Tab>"] = { "select_prev", "snippet_backward", "fallback" },
@@ -40,13 +30,17 @@ return {
 			["<C-p>"] = { "select_prev", "fallback_to_mappings" },
 			["<C-n>"] = { "select_next", "fallback_to_mappings" },
 
+			-- TODO: Does not appear to work?
 			["<C-k>"] = { "show_signature", "hide_signature", "fallback" },
 		},
 
 		appearance = {
-			nerd_font_variant = "normal",
+			-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
+			-- Adjusts spacing to ensure icons are aligned
+			nerd_font_variant = "mono",
 		},
 
+		-- (Default) Only show the documentation popup when manually triggered
 		completion = {
 			ghost_text = {
 				enabled = true,
@@ -54,11 +48,17 @@ return {
 			list = {
 				selection = {
 					preselect = false,
+					-- preselect = function(ctx)
+					-- 	return vim.bo.filetype ~= "markdown"
+					-- end,
 				},
 			},
 			documentation = {
 				auto_show = true,
 				auto_show_delay_ms = 0,
+				window = {
+					border = window.border,
+				},
 			},
 			menu = {
 				auto_show = true,
@@ -77,17 +77,23 @@ return {
 						},
 					},
 				},
+				border = window.border,
 			},
 		},
 
 		signature = {
 			enabled = true,
+			window = {
+				border = window.border,
+			},
 			trigger = {
 				show_on_accept = true,
 				show_on_insert = true,
 			},
 		},
 
+		-- Default list of enabled providers defined so that you can extend it
+		-- elsewhere in your config, without redefining it, due to `opts_extend`
 		sources = {
 			default = {
 				"lazydev",
@@ -100,15 +106,17 @@ return {
 				lazydev = {
 					name = "LazyDev",
 					module = "lazydev.integrations.blink",
+					-- make lazydev completions top priority (see `:h blink.cmp`)
 					score_offset = 100,
 				},
 			},
 		},
 
-		cmdline = {
+		-- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
-			enabled = false,
+		-- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
-		},
+		-- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
-
+		--
+		-- See the fuzzy documentation for more information
 		fuzzy = { implementation = "prefer_rust_with_warning" },
 	},
 	opts_extend = { "sources.default" },

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

@@ -0,0 +1,23 @@
+-- https://github.com/ojroques/nvim-bufdel
+return {
+	"ojroques/nvim-bufdel",
+	cmd = { "BufDel", "BuffDelOthers" },
+	keys = {
+		{
+			"<leader>bd",
+			function()
+				require("bufdel").delete_buffer_expr(nil, false)
+			end,
+			silent = true,
+			desc = "Buffer delete",
+		},
+		{
+			"<leader>bD",
+			function()
+				require("bufdel").delete_buffer_others(false)
+			end,
+			silent = true,
+			desc = "Buffer delete others",
+		},
+	},
+}

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

@@ -2,53 +2,60 @@
 local diagnostic = require("symbols.diagnostic")
 local file = require("symbols.file")
 
---- @module "lazy"
---- @type LazySpec
 return {
 	"akinsho/bufferline.nvim",
-	--- @module "bufferline"
+	dependencies = {
-	--- @type bufferline.UserConfig
+		"ojroques/nvim-bufdel",
-	opts = {
-		options = {
-			show_buffer_icons = false,
-			show_buffer_close_icons = false,
-			diagnostics = "nvim_lsp",
-			separator_style = "thick",
-			left_trunc_marker = "",
-			right_trunc_marker = "",
-			sort_by = "insert_at_end",
-			indicator = {
-				style = "none",
-			},
-			modified_icon = file.modified,
-			---@diagnostic disable-next-line: unused-local
-			diagnostics_indicator = function(count, level, diagnostics_dict, context)
-				local s = " "
-				for e, n in pairs(diagnostics_dict) do
-					local sym = e == "error" and diagnostic.error .. " "
-						or (e == "warning" and diagnostic.warn .. " ")
-						or (e == "info" and diagnostic.info .. " " or diagnostic.hint .. " ")
-					s = s .. n .. sym
-				end
-				return s
-			end,
-		},
 	},
-	init = function()
+	config = function()
+		-- Enable mousemoveevent if possible
+		vim.o.mousemoveevent = true
+
+		local bufferline = require("bufferline")
+
 		-- Setup keybinds to move between buffers
 		vim.keymap.set("n", "<tab>", function()
-			require("bufferline").cycle(1)
+			bufferline.cycle(1)
 		end, { silent = true, desc = "Goto next buffer" })
 		vim.keymap.set("n", "<S-tab>", function()
-			require("bufferline").cycle(-1)
+			bufferline.cycle(-1)
 		end, { silent = true, desc = "Goto previous buffer" })
 
 		-- Setup keybinds to move buffers around
 		vim.keymap.set("n", "<leader>b[", function()
-			require("bufferline").move(-1)
+			bufferline.move(-1)
 		end, { silent = true, desc = "Move buffer to left" })
 		vim.keymap.set("n", "<leader>b]", function()
-			require("bufferline").move(1)
+			bufferline.move(1)
 		end, { silent = true, desc = "Move buffer to right" })
+
+		bufferline.setup({
+			options = {
+				show_buffer_icons = false,
+				show_buffer_close_icons = false,
+				diagnostics = "nvim_lsp",
+				-- close_command = "BufDel %d",
+				-- right_mouse_command = "BufDel %d",
+				separator_style = "thick",
+				left_trunc_marker = "",
+				right_trunc_marker = "",
+				sort_by = "insert_at_end",
+				indicator = {
+					style = "none",
+				},
+				modified_icon = file.modified,
+				---@diagnostic disable-next-line: unused-local
+				diagnostics_indicator = function(count, level, diagnostics_dict, context)
+					local s = " "
+					for e, n in pairs(diagnostics_dict) do
+						local sym = e == "error" and diagnostic.error .. " "
+							or (e == "warning" and diagnostic.warn .. " ")
+							or (e == "info" and diagnostic.info .. " " or diagnostic.hint .. " ")
+						s = s .. n .. sym
+					end
+					return s
+				end,
+			},
+		})
 	end,
 }

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

@@ -1,10 +1,8 @@
 -- https://github.com/NvChad/nvim-colorizer.lua
---- @module "lazy"
---- @type LazySpec
 return {
 	"NvChad/nvim-colorizer.lua",
+	event = "VeryLazy",
 	opts = {
-		lazy_load = true,
 		filetypes = {
 			"*", -- Enable color highlighting for all files
 			"!neo-tree", -- Exclude neo-tree
@@ -19,4 +17,16 @@ return {
 			names = false,
 		},
 	},
+	-- Fix lazy loading: https://github.com/NvChad/nvim-colorizer.lua
+	config = function(_, opts)
+		local colorizer = require("colorizer")
+		colorizer.setup(opts)
+
+		-- nvim-colorizer doesn't work on the initial buffer if we lazy load, so force it to attach
+		-- on load.
+		local bufnr = vim.api.nvim_get_current_buf()
+		if bufnr and not colorizer.is_buffer_attached(bufnr) then
+			colorizer.attach_to_buffer(bufnr)
+		end
+	end,
 }

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

@@ -1,17 +1,6 @@
 -- https://github.com/numToStr/Comment.nvim
---- @module "lazy"
---- @type LazySpec
 return {
-	"numToStr/Comment.nvim",
+	'numToStr/Comment.nvim',
 	event = "VeryLazy",
-	--- @module "Comment"
+	opts = {},
-	--- @type CommentConfig
-	opts = {
-		toggler = {
-			block = "gBc",
-		},
-		opleader = {
-			block = "gB",
-		},
-	},
 }

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

@@ -1,28 +1,10 @@
 -- https://github.com/stevearc/conform.nvim
-local formatters_by_ft = {
+local slow_format_filetypes = {}
-	c = { "clang-format" },
-	cpp = { "clang-format" },
-	go = { "goimports" },
-	python = { "ruff_organize_imports", "ruff_format" },
-	rust = { "rustfmt" },
-	javascript = { "prettier" },
-	javascriptreact = { "prettier" },
-	typescript = { "prettier" },
-	typescriptreact = { "prettier" },
-	css = { "prettier" },
-	markdown = { "prettier" },
-	yaml = { "prettier" },
-	lua = { "stylua" },
-	json = { "prettier" },
-	toml = { "taplo" },
-	-- ["*"] = { "injected" },
-	["_"] = { "trim_whitespace", "trim_newlines" },
-}
-
---- @module "lazy"
---- @type LazySpec
 return {
 	"stevearc/conform.nvim",
+	dependencies = {
+		"williamboman/mason.nvim",
+	},
 	event = { "BufWritePre" },
 	cmd = { "ConformInfo" },
 	keys = {
@@ -33,21 +15,36 @@ return {
 				require("conform").format({ async = true, lsp_fallback = true })
 			end,
 			mode = "",
-			desc = "Format buffer",
+			desc = "[F]ormat buffer",
 		},
 	},
-	--- @module "conform"
-	--- @type conform.setupOpts
 	opts = {
-		formatters_by_ft = formatters_by_ft,
+		formatters_by_ft = require("tools.format"),
 		notify_on_error = false,
 		format_on_save = function(bufnr)
 			if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
 				return
 			end
-			--- @type conform.FormatOpts
+			if slow_format_filetypes[vim.bo[bufnr].filetype] then
-			return { lsp_format = "fallback" }
+				return
+			end
+			local function on_format(err)
+				if err and err:match("timeout$") then
+					slow_format_filetypes[vim.bo[bufnr].filetype] = true
+				end
+			end
+			return { timeout_ms = 200, lsp_fallback = true }, on_format
 		end,
+		format_after_save = function(bufnr)
+			if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+				return
+			end
+			if not slow_format_filetypes[vim.bo[bufnr].filetype] then
+				return
+			end
+			return { lsp_fallback = true }
+		end,
+		-- log_level = vim.log.levels.DEBUG,
 	},
 	init = function()
 		vim.api.nvim_create_user_command("FormatDisable", function(args)
@@ -61,7 +58,6 @@ return {
 			desc = "Disable autoformat-on-save",
 			bang = true,
 		})
-
 		vim.api.nvim_create_user_command("FormatEnable", function()
 			vim.b.disable_autoformat = false
 			vim.g.disable_autoformat = false

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/dap.lua

@@ -1,9 +1,6 @@
 -- https://github.com/mfussenegger/nvim-dap
---- @module "lazy"
---- @type LazySpec
 return {
 	{
-		enabled = false,
 		"mfussenegger/nvim-dap",
 		config = function()
 			local dap = require("dap")
@@ -89,7 +86,6 @@ return {
 		end,
 	},
 	{
-		enabled = false,
 		"theHamsta/nvim-dap-virtual-text",
 		dependencies = {
 			"mfussenegger/nvim-dap",

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

@@ -1,20 +0,0 @@
--- https://github.com/jinh0/eyeliner.nvim
---- @module "lazy"
---- @type LazySpec
-return {
-	"jinh0/eyeliner.nvim",
-	dependencies = {
-		{
-			"ellisonleao/gruvbox.nvim",
-			opts = {
-				overrides = {
-					EyelinerPrimary = { bold = true, underline = true },
-					EyelinerSecondary = { underline = true },
-				},
-			},
-		},
-	},
-	opts = {
-		highlight_on_key = true,
-	},
-}

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

@@ -1,9 +1,5 @@
--- https://github.com/j-hui/fidget.nvim
---- @module "lazy"
---- @type LazySpec
 return {
 	"j-hui/fidget.nvim",
-	event = "LspAttach",
 	opts = {
 		notification = {
 			window = {

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

@@ -1,12 +1,6 @@
--- https://github.com/lewis6991/gitsigns.nvim
---- @module "lazy"
---- @type LazySpec
 return {
 	-- Adds git related signs to the gutter, as well as utilities for managing changes
 	"lewis6991/gitsigns.nvim",
-	event = { "BufWritePost", "BufReadPre" },
-	--- @module "gitsigns"
-	--- @type Gitsigns.Config
 	opts = {
 		signs = {
 			add = { text = "+" },
@@ -26,42 +20,27 @@ return {
 		},
 		attach_to_untracked = true,
 		current_line_blame_opts = {
-			virt_text_pos = "eol",
+			virt_text_pos = "right_align",
-			virt_text_priority = 1,
 			delay = 200,
+			priority = 9999,
 		},
 	},
 	init = function()
-		vim.keymap.set("n", "gs", function()
+		vim.keymap.set("n", "<leader>gs", require("gitsigns.actions").stage_hunk, { desc = "Stage hunk" })
-			require("gitsigns.actions").stage_hunk()
+		vim.keymap.set("v", "<leader>gs", function()
-		end, { desc = "(Un)stage hunk" })
-		vim.keymap.set("n", "gS", function()
-			require("gitsigns.actions").stage_buffer()
-		end, { desc = "Stage buffer" })
-		vim.keymap.set("v", "gs", function()
 			require("gitsigns.actions").stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
-		end, { desc = "(Un)stage selection" })
+		end, { desc = "Stage selection" })
 
-		vim.keymap.set("n", "gd", function()
+		vim.keymap.set("n", "<leader>gS", require("gitsigns.actions").undo_stage_hunk, { desc = "Undo stage hunk" })
-			require("gitsigns.actions").preview_hunk()
-		end, { desc = "Diff hunk" })
 
-		vim.keymap.set("n", "<leader>tb", function()
+		vim.keymap.set("n", "<leader>gd", require("gitsigns.actions").preview_hunk, { desc = "Diff hunk" })
-			require("gitsigns.actions").toggle_current_line_blame()
-		end, { desc = "Line blame" })
-		vim.keymap.set("n", "gb", function()
-			require("gitsigns.actions").blame_line()
-		end, { desc = "View blame" })
 
-		vim.keymap.set("n", "<leader>gr", function()
+		vim.keymap.set("n", "<leader>gb", require("gitsigns.actions").toggle_current_line_blame, { desc = "Blame" })
-			require("gitsigns.actions").reset_hunk()
+
-		end, { desc = "Reset hunk" })
+		vim.keymap.set("n", "<leader>gr", require("gitsigns.actions").reset_hunk, { desc = "Reset hunk" })
-		vim.keymap.set("n", "<leader>gR", function()
-			require("gitsigns.actions").reset_buffer()
-		end, { desc = "Reset buffer" })
 		vim.keymap.set("v", "<leader>gr", function()
 			require("gitsigns.actions").reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
-		end, { desc = "Git reset selection" })
+		end, { desc = "Reset selection" })
 
 		vim.keymap.set("n", "]g", function()
 			require("gitsigns.actions").nav_hunk("next")

nvim/dot-config/nvim/lua/plugins/guess-indent.lua

@@ -1,11 +1,12 @@
 -- https://github.com/NMAC427/guess-indent.nvim
---- @module "lazy"
---- @type LazySpec
 return {
+	-- Adds a command to automatically detect the indentation settings
+	-- Prefer to use .editorconfig for projects and modeline for files
 	"NMAC427/guess-indent.nvim",
-	cmd = "GuessIndent",
+	keys = {
-	event = { "BufReadPre" },
+		{ "<leader>gi", "<cmd>GuessIndent<cr>", desc = "Guess indentation" },
-	--- @module "guess-indent"
+	},
-	--- @type GuessIndentConfig
+	opts = {
-	opts = {},
+		auto_cmd = false,
+	},
 }

nvim/dot-config/nvim/lua/plugins/inc-rename.lua

@@ -1,13 +1,6 @@
 -- https://github.com/smjonas/inc-rename.nvim
---- @module "lazy"
---- @type LazySpec
 return {
 	"smjonas/inc-rename.nvim",
-	cmd = "IncRename",
-	-- We can't load on just the command otherwise the preview does not work
-	event = "LspAttach",
-	--- @module "inc_rename"
-	--- @type inc_rename.UserConfig
 	opts = {
 		preview_empty_name = true,
 	},

nvim/dot-config/nvim/lua/plugins/indent-blankline.lua

@@ -0,0 +1,14 @@
+-- https://github.com/lukas-reineke/indent-blankline.nvim
+return {
+	-- Add indentation guides even on blank lines
+	"lukas-reineke/indent-blankline.nvim",
+	-- Enable `lukas-reineke/indent-blankline.nvim`
+	-- See `:help indent_blankline.txt`
+	main = "ibl",
+	opts = {
+		indent = {
+			char = "¦",
+		},
+		scope = { enabled = true, show_start = false, show_end = false },
+	},
+}

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

@@ -1,9 +1,5 @@
--- https://github.com/diogo464/kubernetes.nvim
---- @module "lazy"
---- @type LazySpec
 return {
 	"diogo464/kubernetes.nvim",
-	ft = "yaml",
 	opts = {
 		schema_strict = true,
 		schema_generate_always = false,

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

@@ -1,16 +1,13 @@
 -- https://github.com/folke/lazydev.nvim
---- @module "lazy"
---- @type LazySpec
 return {
-	"folke/lazydev.nvim",
+	{
-	ft = "lua",
+		"folke/lazydev.nvim",
-	--- @module "lazydev"
+		ft = "lua",
-	--- @type lazydev.Config
+		opts = {
-	opts = {
+			library = {
-		library = {
+				{ path = "luvit-meta/library", words = { "vim%.uv" } },
-			-- See the configuration section for more details
+			},
-			-- Load luvit types when the `vim.uv` word is found
-			{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
 		},
 	},
+	{ "Bilal2453/luvit-meta", lazy = true }, -- optional `vim.uv` typings
 }

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

@@ -1,7 +0,0 @@
--- https://github.com/neovim/nvim-lspconfig
---- @module "lazy"
---- @type LazySpec
-return {
-	"neovim/nvim-lspconfig",
-	cmd = { "LspInfo", "LspStart", "LspStop", "LspRestart" },
-}

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

@@ -1,19 +1,13 @@
 -- 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
+	local schema = require("yaml-companion").get_buf_schema(0)
+	if schema.result[1].name == "none" then
 		return ""
 	end
-
+	return schema.result[1].name
-	local schema = (require("schema-companion").get_current_schemas() or "none")
-	if schema == "none" then
-		return ""
-	end
-	return schema
 end
 
---- @module "lazy"
---- @type LazySpec
 return {
 	"nvim-lualine/lualine.nvim",
 	opts = {
@@ -43,9 +37,7 @@ return {
 				"encoding",
 				{ "fileformat", icons_enabled = false },
 				"filetype",
-				{
+				get_schema,
-					get_schema,
-				},
 			},
 		},
 		inactive_sections = {

nvim/dot-config/nvim/lua/plugins/mason-lspconfig.lua

@@ -1,15 +0,0 @@
--- https://github.com/mason-org/mason-lspconfig.nvim
---- @module "lazy"
---- @type LazySpec
-return {
-	"mason-org/mason-lspconfig.nvim",
-	cmd = { "LspInstall", "LspUninstall" },
-	event = { "BufNewFile", "BufReadPre" },
-	--- @module "mason-lspconfig"
-	--- @type MasonLspconfigSettings
-	opts = {},
-	dependencies = {
-		"mason-org/mason.nvim",
-		"neovim/nvim-lspconfig",
-	},
-}

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

@@ -1,50 +0,0 @@
---- https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim
-local ensure_installed = {
-	-- LSP
-	"typos_lsp",
-	"clangd",
-	"basedpyright",
-	"lua_ls",
-	{
-		"gopls",
-		condition = function()
-			return vim.fn.executable("go") > 0
-		end,
-	},
-	"jsonls",
-	"yamlls",
-	"taplo",
-	"neocmake",
-	-- Formatter
-	"clang-format",
-	{
-		"goimports",
-		condition = function()
-			return vim.fn.executable("go") > 0
-		end,
-	},
-	"ruff",
-	"prettier",
-	"stylua",
-	"eslint",
-}
-
---- @module "lazy"
---- @type LazySpec
-return {
-	"WhoIsSethDaniel/mason-tool-installer.nvim",
-	dependencies = {
-		"mason-org/mason.nvim",
-	},
-	event = "VeryLazy",
-	opts = {
-		ensure_installed = ensure_installed,
-		auto_update = true,
-	},
-	config = function(_, opts)
-		require("mason-tool-installer").setup(opts)
-
-		-- VeryLazy happens _after_ VimEnter, so we have to manually call this
-		require("mason-tool-installer").run_on_start()
-	end,
-}

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

@@ -1,10 +1,47 @@
--- https://github.com/mason-org/mason.nvim
---- @module "lazy"
---- @type LazySpec
 return {
-	"mason-org/mason.nvim",
+	{
-	cmd = { "Mason", "MasonUpdate", "MasonInstall", "MasonUninstall", "MasonUninstallAll", "MasonLog" },
+		"WhoIsSethDaniel/mason-tool-installer.nvim",
-	--- @module "mason"
+		dependencies = {
-	--- @type MasonSettings
+			{ "mason-org/mason.nvim", opts = {} },
-	opts = {},
+			"mason-org/mason-lspconfig.nvim",
+		},
+		config = function()
+			local lsp = require("tools.lsp")
+
+			local ensure_installed = vim.tbl_values(vim.tbl_map(function(tool)
+				if type(tool) == "table" then
+					if not tool.system then
+						return {
+							tool[1],
+							condition = tool.condition,
+						}
+					end
+				else
+					return tool
+				end
+				return nil
+			end, lsp))
+
+			require("mason-tool-installer").setup({
+				ensure_installed = ensure_installed,
+				auto_update = true,
+			})
+		end,
+	},
+	{
+		"mason-org/mason-lspconfig.nvim",
+		opts = {},
+		dependencies = {
+			{ "mason-org/mason.nvim", opts = {} },
+			"neovim/nvim-lspconfig",
+		},
+	},
+	{
+		"zapling/mason-conform.nvim",
+		opts = {},
+		dependencies = {
+			{ "mason-org/mason.nvim", opts = {} },
+			"stevearc/conform.nvim",
+		},
+	},
 }

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

@@ -2,11 +2,9 @@
 local fold = require("symbols.fold")
 local file = require("symbols.file")
 
---- @module "lazy"
---- @type LazySpec
 return {
 	"nvim-neo-tree/neo-tree.nvim",
-	branch = "v3.x",
+	version = "v3.x",
 	dependencies = {
 		"nvim-lua/plenary.nvim",
 		"MunifTanjim/nui.nvim",
@@ -17,86 +15,85 @@ return {
 	},
 	-- netrw hijack does not work when lazy loading
 	lazy = false,
-	--- @module "neo-tree"
+	config = function()
-	--- @type neotree.Config
+		require("neo-tree").setup({
-	opts = {
+			close_if_last_window = true,
-		close_if_last_window = true,
+			popup_border_style = require("symbols.window").border,
-		popup_border_style = require("symbols.window").border,
+			source_selector = {
-		source_selector = {
+				winbar = true,
-			winbar = true,
+				show_scrolled_off_parent_node = true,
-			show_scrolled_off_parent_node = true,
+				sources = {
-			sources = {
+					{
-				{
+						source = "filesystem",
-					source = "filesystem",
+						display_name = " Files ",
-					display_name = " Files ",
+					},
+					{
+						source = "buffers",
+						display_name = " Buffers ",
+					},
+					{
+						source = "git_status",
+						display_name = " Git ",
+					},
 				},
-				{
+				show_separator_on_edge = true,
-					source = "buffers",
+			},
-					display_name = " Buffers ",
+			default_component_configs = {
+				diagnostics = {
+					highlights = {
+						hint = "DiagnosticHint",
+						info = "DiagnosticInfo",
+						warn = "DiagnosticWarn",
+						error = "DiagnosticError",
+					},
 				},
-				{
+				icon = {
-					source = "git_status",
+					folder_closed = fold.closed,
-					display_name = " Git ",
+					folder_open = fold.open,
+					folder_empty = fold.empty,
+					default = file.icon,
+				},
+				modified = {
+					symbol = file.modified,
+				},
+				name = {
+					use_git_status_colors = false,
+				},
+				git_status = {
+					symbols = require("symbols.git"),
+				},
+				type = {
+					enabled = false,
+				},
+				last_modified = {
+					enabled = false,
+				},
+				symlink_target = {
+					enabled = true,
 				},
 			},
-			show_separator_on_edge = true,
+			filesystem = {
-		},
+				follow_current_file = {
-		default_component_configs = {
+					enabled = true,
-			diagnostics = {
+				},
-				highlights = {
+				hijack_netrw_behavior = "open_current",
-					hint = "DiagnosticHint",
+				use_libuv_file_watcher = true,
-					info = "DiagnosticInfo",
+				scan_mode = "deep",
-					warn = "DiagnosticWarn",
+			},
-					error = "DiagnosticError",
+			window = {
+				popup = {
+					title = function(state)
+						return ""
+					end,
+				},
+				position = "float",
+				mappings = {
+					["<C-c>"] = "close_window",
+					["<esc>"] = "close_window",
+					["<tab>"] = "next_source",
+					["<S-tab>"] = "prev_source",
 				},
 			},
-			icon = {
+		})
-				folder_closed = fold.closed,
+	end,
-				folder_open = fold.open,
-				folder_empty = fold.empty,
-				folder_empty_open = fold.open,
-				default = file.icon,
-			},
-			modified = {
-				symbol = file.modified,
-			},
-			name = {
-				use_git_status_colors = false,
-			},
-			git_status = {
-				symbols = require("symbols.git"),
-			},
-			type = {
-				enabled = false,
-			},
-			last_modified = {
-				enabled = false,
-			},
-			symlink_target = {
-				enabled = true,
-			},
-		},
-		filesystem = {
-			follow_current_file = {
-				enabled = true,
-			},
-			hijack_netrw_behavior = "open_current",
-			use_libuv_file_watcher = true,
-			scan_mode = "deep",
-		},
-		window = {
-			popup = {
-				title = function()
-					return ""
-				end,
-			},
-			position = "float",
-			mappings = {
-				["<C-c>"] = "close_window",
-				["<esc>"] = "close_window",
-				["<tab>"] = "next_source",
-				["<S-tab>"] = "prev_source",
-			},
-		},
-	},
 }

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

@@ -1,6 +1,4 @@
 -- https://github.com/toppair/peek.nvim
---- @module "lazy"
---- @type LazySpec
 return {
 	"toppair/peek.nvim",
 	build = "deno task --quiet build:fast",

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

@@ -1,17 +0,0 @@
--- https://github.com/tadachs/ros-nvim
---- @module "lazy"
---- @type LazySpec
-return {
-	"tadachs/ros-nvim",
-	event = { "BufRead", "BufNewFile" },
-	opts = {
-		commands = {
-			enabled = false,
-		},
-	},
-	build = ":TSInstall ros",
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-		"nvim-treesitter/nvim-treesitter",
-	},
-}

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

@@ -1,26 +0,0 @@
--- https://github.com/cenk1cenk2/schema-companion.nvim
---- @module "schema-companion"
---- @type schema_companion.Matcher
-
---- @module "lazy"
---- @type LazySpec
-return {
-	"cenk1cenk2/schema-companion.nvim",
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-		"diogo464/kubernetes.nvim",
-	},
-	keys = {
-		{
-			"<leader>ys",
-			function()
-				require("schema-companion").select_schema()
-			end,
-			desc = "Yaml schema",
-			ft = "yaml",
-		},
-	},
-	--- @module "schema-companion"
-	--- @type schema_companion.Config
-	opts = {},
-}

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

@@ -1,7 +1,13 @@
--- https://github.com/b0o/schemastore.nvim
---- @module "lazy"
---- @type LazySpec
 return {
 	"b0o/schemastore.nvim",
-	lazy = true,
+	config = function()
+		vim.lsp.config("jsonls", {
+			settings = {
+				json = {
+					validate = { enable = true },
+					schemas = require("schemastore").json.schemas(),
+				},
+			},
+		})
+	end
 }

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

@@ -1,8 +0,0 @@
--- https://github.com/Aasim-A/scrollEOF.nvim
---- @module "lazy"
---- @type LazySpec
-return {
-	"Aasim-A/scrollEOF.nvim",
-	event = { "CursorMoved", "WinScrolled" },
-	opts = {},
-}

nvim/dot-config/nvim/lua/plugins/smart-splits.lua

@@ -1,53 +1,25 @@
 -- https://github.com/mrjones2014/smart-splits.nvim
---- @module "lazy"
---- @type LazySpec
 return {
 	"mrjones2014/smart-splits.nvim",
-	event = "VeryLazy",
+	config = function()
-	--- @module "smart-splits"
+		vim.keymap.set("n", "<M-h>", require("smart-splits").move_cursor_left)
-	--- @type SmartSplitsConfig
+		vim.keymap.set("n", "<M-j>", require("smart-splits").move_cursor_down)
-	opts = {
+		vim.keymap.set("n", "<M-k>", require("smart-splits").move_cursor_up)
-		at_edge = "stop",
+		vim.keymap.set("n", "<M-l>", require("smart-splits").move_cursor_right)
-		cursor_follows_swapped_bufs = true,
-	},
-	init = function()
-		vim.keymap.set("n", "<M-h>", function()
-			require("smart-splits").move_cursor_left()
-		end)
-		vim.keymap.set("n", "<M-j>", function()
-			require("smart-splits").move_cursor_down()
-		end)
-		vim.keymap.set("n", "<M-k>", function()
-			require("smart-splits").move_cursor_up()
-		end)
-		vim.keymap.set("n", "<M-l>", function()
-			require("smart-splits").move_cursor_right()
-		end)
 
-		vim.keymap.set("n", "<C-w>h", function()
+		vim.keymap.set("n", "<C-w>h", require("smart-splits").swap_buf_left, { desc = "Swap buffer to the left" })
-			require("smart-splits").swap_buf_left()
+		vim.keymap.set("n", "<C-w>j", require("smart-splits").swap_buf_down, { desc = "Swap buffer to the bottom" })
-		end, { desc = "Swap buffer to the left" })
+		vim.keymap.set("n", "<C-w>k", require("smart-splits").swap_buf_up, { desc = "Swap buffer to the top" })
-		vim.keymap.set("n", "<C-w>j", function()
+		vim.keymap.set("n", "<C-w>l", require("smart-splits").swap_buf_right, { desc = "Swap buffer to the right" })
-			require("smart-splits").swap_buf_down()
-		end, { desc = "Swap buffer to the bottom" })
-		vim.keymap.set("n", "<C-w>k", function()
-			require("smart-splits").swap_buf_up()
-		end, { desc = "Swap buffer to the top" })
-		vim.keymap.set("n", "<C-w>l", function()
-			require("smart-splits").swap_buf_right()
-		end, { desc = "Swap buffer to the right" })
 
-		vim.keymap.set("n", "<M-left>", function()
+		vim.keymap.set("n", "<M-left>", require("smart-splits").resize_left, { desc = "Resize buffer to the left" })
-			require("smart-splits").resize_left()
+		vim.keymap.set("n", "<M-down>", require("smart-splits").resize_down, { desc = "Resize buffer to the bottom" })
-		end, { desc = "Resize buffer to the left" })
+		vim.keymap.set("n", "<M-up>", require("smart-splits").resize_up, { desc = "Resize buffer to the top" })
-		vim.keymap.set("n", "<M-down>", function()
+		vim.keymap.set("n", "<M-right>", require("smart-splits").resize_right, { desc = "Resize buffer to the right" })
-			require("smart-splits").resize_down()
+
-		end, { desc = "Resize buffer to the bottom" })
+		require("smart-splits").setup({
-		vim.keymap.set("n", "<M-up>", function()
+			at_edge = "stop",
-			require("smart-splits").resize_up()
+			cursor_follows_swapped_bufs = true,
-		end, { desc = "Resize buffer to the top" })
+		})
-		vim.keymap.set("n", "<M-right>", function()
-			require("smart-splits").resize_right()
-		end, { desc = "Resize buffer to the right" })
 	end,
 }

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

@@ -1,73 +0,0 @@
--- https://github.com/folke/snacks.nvim
---- @module "lazy"
---- @type LazySpec
-return {
-	{
-		"folke/snacks.nvim",
-		priority = 1000,
-		lazy = false,
-		--- @module "snacks"
-		--- @type snacks.Config
-		opts = {
-			bigfile = {
-				enabled = true,
-				---@param ctx {buf: number, ft:string}
-				setup = function(ctx)
-					-- Disable treesitter
-					vim.treesitter.stop(ctx.buf)
-
-					vim.schedule(function()
-						if vim.api.nvim_buf_is_valid(ctx.buf) then
-							vim.bo[ctx.buf].syntax = ctx.ft
-						end
-					end)
-				end,
-			},
-			indent = {
-				enabled = true,
-				indent = {
-					char = "¦",
-				},
-				animate = {
-					enabled = false,
-				},
-				scope = {
-					char = "¦",
-					only_current = true,
-				},
-			},
-		},
-		keys = {
-			{
-				"<leader>bd",
-				function()
-					Snacks.bufdelete.delete()
-				end,
-				silent = true,
-				desc = "Buffer delete",
-			},
-			{
-				"<leader>bD",
-				function()
-					Snacks.bufdelete.other()
-				end,
-				silent = true,
-				desc = "Buffer delete others",
-			},
-		},
-	},
-	{
-		"nvim-neo-tree/neo-tree.nvim",
-		opts = function(_, opts)
-			local function on_move(data)
-				Snacks.rename.on_rename_file(data.source, data.destination)
-			end
-			local events = require("neo-tree.events")
-			opts.event_handlers = opts.event_handlers or {}
-			vim.list_extend(opts.event_handlers, {
-				{ event = events.FILE_MOVED, handler = on_move },
-				{ event = events.FILE_RENAMED, handler = on_move },
-			})
-		end,
-	},
-}

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

@@ -1,12 +1,6 @@
 -- https://github.com/kylechui/nvim-surround
---- @module "lazy"
---- @type LazySpec
 return {
 	"kylechui/nvim-surround",
 	event = "VeryLazy",
-	--- @module "nvim-surround"
+	config = true,
-	--- @type user_options
-	opts = {
-		move_cursor = "sticky",
-	},
 }

nvim/dot-config/nvim/lua/plugins/symbols-outline.lua

@@ -0,0 +1,15 @@
+-- https://github.com/simrat39/symbols-outline.nvim
+return {
+	enabled = false,
+	"simrat39/symbols-outline.nvim",
+	keys = {
+		{
+			"<F5>",
+			function()
+				require("symbols-outline").toggle_outline()
+			end,
+			desc = "Toggle symbols outline",
+		},
+	},
+	opts = {},
+}

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

@@ -1,149 +1,82 @@
 -- https://github.com/nvim-telescope/telescope.nvim
-local window = require("symbols.window")
+-- TODO: Ensure installed ripgrep
---- @module "lazy"
---- @type LazySpec
 return {
-	{
+	"nvim-telescope/telescope.nvim",
-		"nvim-telescope/telescope.nvim",
+	dependencies = {
-		cmd = { "Telescope" },
+		"nvim-lua/plenary.nvim",
-		lazy = false,
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-		},
-		opts = function()
-			return {
-				pickers = {
-					find_files = {
-						hidden = true,
-					},
-				},
-				defaults = {
-					file_ignore_patterns = {
-						".git/",
-					},
-					mappings = {
-						n = {
-							["<Tab>"] = "move_selection_worse",
-							["<S-Tab>"] = "move_selection_better",
-						},
-						i = {
-							["<Tab>"] = "move_selection_worse",
-							["<S-Tab>"] = "move_selection_better",
-						},
-					},
-					borderchars = window.borderchars,
-				},
-				extensions = {
-					["ui-select"] = {
-						require("telescope.themes").get_dropdown(),
-					},
-					smart_open = {
-						match_algorithm = "fzf",
-					},
-				},
-			}
-		end,
-		init = function()
-			vim.keymap.set("n", "<leader>.", function()
-				require("telescope.builtin").oldfiles()
-			end, { desc = "Find recently opened files" })
-			vim.keymap.set("n", "<leader>sb", function()
-				require("telescope.builtin").buffers()
-			end, { desc = "Buffers" })
-
-			vim.keymap.set("n", "<leader>/", function()
-				require("telescope.builtin").current_buffer_fuzzy_find({
-					-- Show matches in the order they appear in the document
-					sorting_strategy = "ascending",
-				})
-			end, { desc = "Fuzzily search in current buffer" })
-			vim.keymap.set("n", "<leader>s/", function()
-				require("telescope.builtin").live_grep({
-					grep_open_files = true,
-					prompt_title = "Live Grep in Open Files",
-				})
-			end, { desc = "Grep in open files" })
-
-			vim.keymap.set("n", "<leader><space>", function()
-				require("telescope").extensions.smart_open.smart_open()
-			end, { desc = "Find files" })
-			vim.keymap.set("n", "<leader>sh", function()
-				require("telescope.builtin").help_tags()
-			end, { desc = "Help" })
-			vim.keymap.set("n", "<leader>sw", function()
-				require("telescope.builtin").grep_string({
-					-- Show matches in the order they appear in the document
-					sorting_strategy = "ascending",
-				})
-			end, { desc = "Current word" })
-			vim.keymap.set("n", "<leader>sg", function()
-				require("telescope.builtin").live_grep()
-			end, { desc = "Grep" })
-			vim.keymap.set("n", "<leader>sd", function()
-				require("telescope.builtin").diagnostics()
-			end, { desc = "Diagnostics" })
-			vim.keymap.set("n", "<leader>sr", function()
-				require("telescope.builtin").resume()
-			end, { desc = "Resume" })
-			vim.keymap.set("n", "<leader>sk", function()
-				require("telescope.builtin").keymaps()
-			end, { desc = "Keymaps" })
-			vim.keymap.set("n", "<leader>sn", function()
-				require("telescope.builtin").find_files({ cwd = vim.fn.stdpath("config") })
-			end, { desc = "Neovim files" })
-
-			-- HACK: Workaround until new borders are fixed in telescope
-			vim.api.nvim_create_autocmd("User", {
-				pattern = "TelescopeFindPre",
-				callback = function()
-					vim.opt_local.winborder = "none"
-					vim.api.nvim_create_autocmd("WinLeave", {
-						once = true,
-						callback = function()
-							vim.opt_local.winborder = window.border
-						end,
-					})
-				end,
-			})
-		end,
-	},
-	{
 		"nvim-telescope/telescope-ui-select.nvim",
-		dependencies = {
+		{
-			"nvim-telescope/telescope.nvim",
-		},
-		config = function()
-			require("telescope").load_extension("ui-select")
-		end,
-	},
-	{
-		"nvim-telescope/telescope-fzf-native.nvim",
-		build = "make",
-		dependencies = {
-			"nvim-telescope/telescope.nvim",
-		},
-		config = function()
-			require("telescope").load_extension("fzf")
-		end,
-	},
-	{
-		"danielfalk/smart-open.nvim",
-		branch = "0.3.x",
-		config = function()
-			require("telescope").load_extension("smart_open")
-		end,
-		dependencies = {
-			"kkharji/sqlite.lua",
-			"nvim-telescope/telescope.nvim",
 			"nvim-telescope/telescope-fzf-native.nvim",
-			{
+			build = "make",
-				"ellisonleao/gruvbox.nvim",
+			cond = function()
-				opts = function(_, opts)
+				return vim.fn.executable("make") == 1
-					local palette = require("gruvbox").palette
+			end,
-
-					opts.overrides.Directory = { fg = palette.neutral_blue, bold = false }
-				end,
-			},
 		},
 	},
+	config = function()
+		require("telescope").setup({
+
+			pickers = {
+				find_files = {
+					hidden = true,
+				},
+			},
+			defaults = {
+				file_ignore_patterns = {
+					".git/",
+				},
+				mappings = {
+					n = {
+						["<Tab>"] = "move_selection_worse",
+						["<S-Tab>"] = "move_selection_better",
+					},
+					i = {
+						["<Tab>"] = "move_selection_worse",
+						["<S-Tab>"] = "move_selection_better",
+					},
+				},
+				borderchars = require("symbols.window").borderchars,
+			},
+			extensions = {
+				["ui-select"] = {
+					require("telescope.themes").get_dropdown(),
+				},
+			},
+		})
+
+		require("telescope").load_extension("fzf")
+		require("telescope").load_extension("ui-select")
+
+		vim.keymap.set("n", "<leader>.", require("telescope.builtin").oldfiles, { desc = "Find recently opened files" })
+		vim.keymap.set("n", "<leader>sb", require("telescope.builtin").buffers, { desc = "Buffers" })
+
+		vim.keymap.set("n", "<leader>/", function()
+			require("telescope.builtin").current_buffer_fuzzy_find({
+				-- Show matches in the order they appear in the document
+				sorting_strategy = "ascending",
+			})
+		end, { desc = "Fuzzily search in current buffer" })
+		vim.keymap.set("n", "<leader>s/", function()
+			require("telescope.builtin").live_grep({
+				grep_open_files = true,
+				prompt_title = "Live Grep in Open Files",
+			})
+		end, { desc = "Grep in open files" })
+
+		vim.keymap.set("n", "<leader><space>", require("telescope.builtin").find_files, { desc = "Find files" })
+		vim.keymap.set("n", "<leader>sh", require("telescope.builtin").help_tags, { desc = "Help" })
+		vim.keymap.set("n", "<leader>sw", function()
+			require("telescope.builtin").grep_string({
+				-- Show matches in the order they appear in the document
+				sorting_strategy = "ascending",
+			})
+		end, { desc = "Current word" })
+		vim.keymap.set("n", "<leader>sg", require("telescope.builtin").live_grep, { desc = "Grep" })
+		vim.keymap.set("n", "<leader>sd", require("telescope.builtin").diagnostics, { desc = "Diagnostics" })
+		vim.keymap.set("n", "<leader>sr", require("telescope.builtin").resume, { desc = "Resume" })
+		vim.keymap.set("n", "<leader>sk", require("telescope.builtin").keymaps, { desc = "Keymaps" })
+		vim.keymap.set("n", "<leader>sn", function()
+			require("telescope.builtin").find_files({ cwd = vim.fn.stdpath("config") })
+		end, { desc = "Neovim files" })
+	end,
 }

nvim/dot-config/nvim/lua/plugins/todo-comments.lua

@@ -1,51 +1,14 @@
 -- https://github.com/folke/todo-comments.nvim
 local diagnostic = require("symbols.diagnostic")
 
---- @module "lazy"
---- @type LazySpec
 return {
-	"folke/todo-comments.nvim",
+	-- 'folke/todo-comments.nvim',
+	-- NOTE: This fork highlights the entire matched word, not just the keyword.
+	"doongjohn/todo-comments.nvim",
 	dependencies = {
 		"nvim-lua/plenary.nvim",
 	},
-	event = "VeryLazy",
+	config = function()
-	opts = {
-		signs = false,
-		keywords = {
-			-- FIX: Fix
-			FIX = { icon = diagnostic.bug },
-			-- TODO: Todo
-			TODO = { icon = diagnostic.todo },
-			-- HACK: Hack
-			HACK = { icon = diagnostic.hack },
-			-- WARN: Warn
-			WARN = { icon = diagnostic.warn },
-			-- PERF: Perf
-			PERF = { icon = diagnostic.performance },
-			-- NOTE: Note
-			NOTE = { icon = diagnostic.note },
-			-- TEST: Test
-			TEST = { icon = diagnostic.test },
-		},
-		highlight = {
-			-- TODO: Have multiline, but end when %p (punctuation) is at the end of a line
-			multiline = false,
-			before = "fg",
-			pattern = [[(KEYWORDS)\s*(\([^\)]*\))?:]],
-		},
-		search = {
-			pattern = [[\b(KEYWORDS)(\(.*\))?:]],
-		},
-		colors = {
-			error = { "TodoCommentError" },
-			warning = { "TodoCommentWarning" },
-			info = { "TodoCommentInfo" },
-			hint = { "TodoCommentHint" },
-			test = { "TodoCommentTest" },
-			default = { "TodoCommentDefault" },
-		},
-	},
-	init = function()
 		vim.keymap.set("n", "]t", function()
 			require("todo-comments").jump_next()
 		end, { desc = "Next todo comment" })
@@ -54,12 +17,49 @@ return {
 			require("todo-comments").jump_prev()
 		end, { desc = "Previous todo comment" })
 
-		-- -- TODO: Use cwd to only show todo's in the current file
+		if pcall(require, "trouble") then
-		-- -- vim.keymap.set("n", "<F4>", "<cmd>TroubleToggle todo cwd=%<cr>", { desc = "Next todo comment" })
+			-- TODO: Use cwd to only show todo's in the current file
-		-- vim.keymap.set("n", "<F4>", "<cmd>TroubleToggle todo<cr>", { desc = "Next todo comment" })
+			-- vim.keymap.set("n", "<F4>", "<cmd>TroubleToggle todo cwd=%<cr>", { desc = "Next todo comment" })
+			vim.keymap.set("n", "<F4>", "<cmd>TroubleToggle todo<cr>", { desc = "Next todo comment" })
+		end
+		if pcall(require, "telescope") then
+			vim.keymap.set("n", "<leader>st", "<cmd>TodoTelescope<cr>", { desc = "Search todo" })
+		end
 
-		vim.keymap.set("n", "<leader>st", function()
+		require("todo-comments").setup({
-			require("telescope").extensions["todo-comments"].todo()
+			keywords = {
-		end, { desc = "Search todo" })
+				-- FIX: Fix
+				FIX = { icon = diagnostic.bug },
+				-- TODO: Todo
+				TODO = { icon = diagnostic.todo },
+				-- HACK: Hack
+				HACK = { icon = diagnostic.hack },
+				-- WARN: Warn
+				WARN = { icon = diagnostic.warning },
+				-- PERF: Perf
+				PERF = { icon = diagnostic.performance },
+				-- NOTE: Note
+				NOTE = { icon = diagnostic.note },
+				-- TEST: Test
+				TEST = { icon = diagnostic.test },
+			},
+			highlight = {
+				-- TODO: Have multiline, but end when %p (punctuation) is at the end of a line
+				multiline = false,
+				before = "fg",
+				pattern = [[(KEYWORDS)\s*(\([^\)]*\))?:]],
+			},
+			search = {
+				pattern = [[\b(KEYWORDS)(\(.*\))?:]],
+			},
+			colors = {
+				error = { "TodoCommentError" },
+				warning = { "TodoCommentWarning" },
+				info = { "TodoCommentInfo" },
+				hint = { "TodoCommentHint" },
+				test = { "TodoCommentTest" },
+				default = { "TodoCommentDefault" },
+			},
+		})
 	end,
 }

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

@@ -1,54 +1,27 @@
--- https://github.com/nvim-treesitter/nvim-treesitter
---- @module "lazy"
---- @type LazySpec
 return {
 	{
+		-- Highlight, edit, and navigate code
 		"nvim-treesitter/nvim-treesitter",
 		dependencies = {
-			{ "nvim-treesitter/nvim-treesitter-textobjects", branch = "master" },
+			"nvim-treesitter/nvim-treesitter-context",
-			{ "windwp/nvim-ts-autotag", opts = {} },
+			{ "nvim-treesitter/nvim-treesitter-textobjects", branch = "main" },
+			"windwp/nvim-ts-autotag",
 		},
 		lazy = false,
-		branch = "master",
+		branch = "main",
 		build = ":TSUpdate",
-		main = "nvim-treesitter.configs",
-		init = function()
-			vim.wo.foldmethod = "expr"
-			vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
-		end,
-		--- @module "nvim-treesitter"
-		--- @type TSConfig
 		opts = {
-			ensure_installed = {
+			ensure_installed = require("tools.highlight"),
-				"c",
-				"cpp",
-				"go",
-				"lua",
-				"python",
-				"rust",
-				"tsx",
-				"typescript",
-				"vimdoc",
-				"vim",
-				"markdown",
-				"markdown_inline",
-				"bash",
-				"sql",
-				"xml",
-				"cmake",
-				"json",
-				"yaml",
-			},
-			auto_install = true,
 
 			highlight = { enable = true },
 			indent = { enable = true },
 			incremental_selection = {
 				enable = true,
 				keymaps = {
-					init_selection = "<M-o>",
+					init_selection = "<c-space>",
-					node_incremental = "<M-o>",
+					node_incremental = "<c-space>",
-					node_decremental = "<M-i>",
+					scope_incremental = "<c-s>",
+					node_decremental = "<M-space>",
 				},
 			},
 			textobjects = {
@@ -98,6 +71,9 @@ return {
 					},
 				},
 			},
+			autotag = {
+				enable = true,
+			},
 		},
 	},
 }

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

@@ -1,21 +1,19 @@
 -- https://github.com/folke/trouble.nvim
 local fold = require("symbols.fold")
 
---- @module "lazy"
---- @type LazySpec
 return {
 	"folke/trouble.nvim",
 	cmd = { "Trouble", "TroubleToggle" },
 	keys = {
 		{ "<F3>", "<cmd>TroubleToggle workspace_diagnostics<cr>", desc = "Goto previous buffer" },
 	},
-	--- @module "trouble"
+	config = function()
-	--- @type trouble.Config
+		require("trouble").setup({
-	opts = {
+			icons = false,
-		icons = false,
+			auto_close = true,
-		auto_close = true,
+			fold_open = fold.open, -- icon used for open folds
-		fold_open = fold.open, -- icon used for open folds
+			fold_closed = fold.close, -- icon used for closed folds
-		fold_closed = fold.close, -- icon used for closed folds
+			use_diagnostic_signs = true,
-		use_diagnostic_signs = true,
+		})
-	},
+	end,
 }

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

@@ -1,9 +1,7 @@
 -- https://github.com/mbbill/undotree
---- @module "lazy"
---- @type LazySpec
 return {
-	"mbbill/undotree",
+	'mbbill/undotree',
 	keys = {
-		{ "<F6>", vim.cmd.UndotreeToggle, desc = "Toggle undotree" },
+		{ '<F6>', vim.cmd.UndotreeToggle, desc = 'Toggle undotree' },
 	},
 }

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

@@ -1,21 +1,13 @@
 -- https://github.com/folke/which-key.nvim
-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
 	opts = {
 		preset = "modern",
 		delay = function(ctx)
 			return ctx.plugin and 0 or 500
 		end,
 		win = {
-			border = window.border,
+			border = "single",
 			padding = { 1, 1 },
 			title = false,
 		},
@@ -51,13 +43,14 @@ return {
 		},
 		expand = 1,
 		sort = { "alphanum" },
-		spec = {
-			{ "<leader>b", group = "Buffer" },
-			{ "<leader>d", group = "Doument" },
-			{ "<leader>g", group = "Git" },
-			{ "<leader>t", group = "Toggle" },
-			{ "<leader>s", group = "Search" },
-			{ "gr", group = "LSP" },
-		},
 	},
+	init = function()
+		-- TODO: Only make a category show up if there actually are any keybinds under it
+		require("which-key").add({
+			{ "<leader>b", group = "Buffer" },
+			{ "<leader>d", group = "Document" },
+			{ "<leader>g", group = "Git" },
+			{ "<leader>s", group = "Search" },
+		})
+	end,
 }

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

@@ -0,0 +1,19 @@
+return {
+	enabled = false,
+	"johnfrankmorgan/whitespace.nvim",
+	config = function()
+		require("whitespace-nvim").setup({
+			-- configuration options and their defaults
+
+			-- `highlight` configures which highlight is used to display
+			-- trailing whitespace
+			highlight = "CursorLine",
+			-- `ignored_filetypes` configures which filetypes to ignore when
+			-- displaying trailing whitespace
+			ignored_filetypes = { "TelescopePrompt", "Trouble", "help" },
+		})
+
+		-- remove trailing whitespace with a keybinding
+		vim.keymap.set("n", "<Leader>t", require("whitespace-nvim").trim, { desc = "Remove trailing whitespace" })
+	end,
+}

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

@@ -0,0 +1,19 @@
+return {
+	"someone-stole-my-name/yaml-companion.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+		"nvim-telescope/telescope.nvim",
+		"nvim-telescope/telescope.nvim",
+		"diogo464/kubernetes.nvim",
+	},
+	config = function()
+		require("telescope").load_extension("yaml_schema")
+
+		vim.lsp.config("yamlls", require("yaml-companion").setup({
+			builtin_matchers = {
+				kubernetes = { enabled = false },
+				kubernetes_custom = { enabled = true },
+			},
+		}))
+	end,
+}

nvim/dot-config/nvim/lua/symbols/diagnostic.lua

@@ -1,13 +1,9 @@
 -- Symbols to use for diagnostics
 return {
 	-- LSP Status symbols
-	[vim.diagnostic.severity.ERROR] = " ",
+	error = "",
-	[vim.diagnostic.severity.WARN] = " ",
+	warn = "",
-	[vim.diagnostic.severity.INFO] = " ",
+	info = "",
-	[vim.diagnostic.severity.HINT] = "󰌵",
-	error = " ",
-	warn = " ",
-	info = " ",
 	hint = "󰌵",
 	-- Comment type symbols
 	bug = "󰃤",

nvim/dot-config/nvim/lua/themes/gruvbox.lua

@@ -1,25 +1,16 @@
 -- https://github.com/ellisonleao/gruvbox.nvim
---- @module "lazy"
---- @type LazySpec
 return {
 	"ellisonleao/gruvbox.nvim",
 	priority = 1000,
-	config = function(_, opts)
+	config = function()
-		require("gruvbox").setup(opts)
-
-		-- Load the colorscheme
-		vim.cmd.colorscheme("gruvbox")
-	end,
-	opts = function()
 		local palette = require("gruvbox").palette
 
-		return {
+		require("gruvbox").setup({
 			background = "dark",
 			italic = {
 				strings = false,
 			},
 			overrides = {
-				CursorLineNr = { fg = palette.light4, bg = palette.dark1, bold = true },
 				YankHighlight = { fg = palette.bright_blue, bg = palette.dark0, reverse = true },
 				Search = { fg = palette.bright_aqua },
 				IncSearch = { link = "Search" },
@@ -52,12 +43,12 @@ return {
 				TodoCommentHint = { fg = palette.bright_aqua },
 				TodoCommentTest = { fg = palette.bright_purple },
 				TodoCommentDefault = { fg = palette.bright_blue },
-				GitSignsAdd = { fg = palette.bright_green, bold = true },
+				GitSignsAdd = { link = "GruvboxGreenSign" },
-				GitSignsStagedAdd = { fg = palette.dark_green, bold = true },
+				GitSignsStagedAdd = { fg = palette.dark_green, bg = palette.dark1 },
-				GitSignsChange = { fg = palette.bright_aqua, bold = true },
+				GitSignsChange = { link = "GruvboxAquaSign" },
-				GitSignsStagedChange = { fg = palette.dark_aqua, bold = true },
+				GitSignsStagedChange = { fg = palette.dark_aqua, bg = palette.dark1 },
-				GitSignsDelete = { fg = palette.bright_red, bold = true },
+				GitSignsDelete = { link = "GruvboxRedSign" },
-				GitSignsStagedDelete = { fg = palette.dark_red, bold = true },
+				GitSignsStagedDelete = { fg = palette.dark_red, bg = palette.dark1 },
 				GitSignsCurrentLineBlame = { link = "GruvboxFg4" },
 				NeoTreeGitAdded = { link = "GruboxGreen" },
 				NeoTreeGitModified = { link = "GruvboxAqua" },
@@ -77,12 +68,10 @@ return {
 				NeoTreeFileIcon = { fg = palette.light1 },
 				NeoTreeFilterTerm = { fg = palette.bright_aqua, bold = true },
 				NeoTreeSymbolicLinkTarget = { fg = palette.bright_aqua, bold = true },
-				DiagnosticNumError = { fg = palette.dark0, bg = palette.bright_red, bold = true },
-				DiagnosticNumWarn = { fg = palette.dark0, bg = palette.bright_yellow, bold = true },
-				DiagnosticNumHint = { fg = palette.dark0, bg = palette.bright_aqua, bold = true },
-				DiagnosticNumInfo = { fg = palette.dark0, bg = palette.bright_blue, bold = true },
-				SnacksIndentScope = { fg = palette.light4 },
 			},
-		}
+		})
+
+		-- Load the colorscheme
+		vim.cmd.colorscheme("gruvbox")
 	end,
 }

nvim/dot-config/nvim/lua/tools/format.lua

@@ -0,0 +1,19 @@
+return {
+	c = { "clang-format" },
+	cpp = { "clang-format" },
+	go = { "goimports", "gofmt" },
+	python = { "ruff_organize_imports", "ruff_format" },
+	rust = { "rustfmt" },
+	javascript = { "prettierd" },
+	javascriptreact = { "prettierd" },
+	typescript = { "prettierd" },
+	typescriptreact = { "prettierd" },
+	css = { "prettierd" },
+	markdown = { "prettierd" },
+	yaml = { "prettierd" },
+	lua = { "stylua" },
+	json = { "jq" },
+	toml = { "taplo" },
+	-- ["*"] = { "injected" },
+	["_"] = { "trim_whitespace", "trim_newlines" },
+}

nvim/dot-config/nvim/lua/tools/highlight.lua

@@ -0,0 +1,16 @@
+return {
+	"c",
+	"cpp",
+	"go",
+	"lua",
+	"python",
+	"rust",
+	"tsx",
+	"typescript",
+	"vimdoc",
+	"vim",
+	"markdown",
+	"markdown_inline",
+	"bash",
+	"sql",
+}

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

@@ -0,0 +1,45 @@
+return {
+	{
+		"rust_analyzer",
+		{
+			settings = {
+				["rust-analyzer"] = {
+					check = {
+						command = "clippy",
+					},
+				},
+			},
+		},
+		system = "rust-analyzer",
+	},
+	{ "typos_lsp", {
+		init_options = {
+			diagnosticSeverity = "Hint",
+		},
+	} },
+	{ "clangd", {
+		cmd = { "clangd", "--offset-encoding=utf-16", "--clang-tidy" },
+	} },
+	"pyright",
+	{
+		"lua_ls",
+		{
+			settings = {
+				Lua = {
+					workspace = { checkThirdParty = false },
+					telemetry = { enable = false },
+				},
+			},
+		},
+	},
+	{
+		"gopls",
+		condition = function()
+			return vim.fn.executable("go") > 0
+		end,
+	},
+	"jsonls",
+	"yamlls",
+	"taplo",
+	"neocmake",
+}

nvim/dot-config/nvim/lua/yaml-companion/builtin/kubernetes_custom.lua

@@ -0,0 +1,35 @@
+local M = {}
+
+local api = vim.api
+local uri = require("kubernetes").yamlls_schema()
+
+local schema = {
+	name = "Kubernetes",
+	uri = uri,
+}
+
+M.match = function(bufnr)
+	local lines = 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 schema
+		end
+	end
+end
+
+M.handles = function()
+	return { schema }
+end
+
+return M

sesh/.stow-local-ignore

@@ -1 +0,0 @@
-setup

sesh/dot-config/sesh/sesh.toml

@@ -1,25 +0,0 @@
-# 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) && tmux set detach-on-destroy on && clear"
-
-[[session]]
-name = "automation_rs"
-path = "~/Projects/rust/automation_rs/"
-startup_command = "nvim"
-windows = ["shell"]
-
-[[session]]
-name = "olympus"
-startup_command = "ssh olympus && exit"
-
-[[session]]
-name = "niestern_sander"
-path = "~/Projects/ALTEN/niestern_sander/"
-startup_command = "$DOTFILES/sesh/setup/niestern_sander.sh"
-
-[[window]]
-name = "shell"

sesh/dot-local/bin/sesh-select

@@ -1,17 +0,0 @@
-#!/usr/bin/env zsh
-
-exec </dev/tty
-exec <&1
-local session
-session=$(sesh list -i | fzf-tmux -p 70%,60% \
---no-sort --ansi --border-label ' Select session ' --prompt '⚡  ' \
---header '  ^a all ^t tmux ^g configs ^x zoxide ^d tmux kill ^f find' \
---bind 'btab:down,tab:up' \
---bind 'ctrl-a:change-prompt(⚡  )+reload(sesh list -i)' \
---bind 'ctrl-t:change-prompt(🪟  )+reload(sesh list -t -i)' \
---bind 'ctrl-g:change-prompt(⚙️  )+reload(sesh list -c -i)' \
---bind 'ctrl-x:change-prompt(📁  )+reload(sesh list -z -i)' \
---bind 'ctrl-f:change-prompt(🔎  )+reload(fd -H -d 2 -t d -E .Trash . ~)' \
---bind 'ctrl-d:execute(tmux kill-session -t {2..})+change-prompt(⚡  )+reload(sesh list -i)')
-[[ -z "$session" ]] && return
-sesh connect $session

sesh/setup/niestern_sander.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-if ! systemctl is-active --quiet docker; then
-	echo "Starting docker..."
-	systemctl start docker
-fi
-
-devcontainer up --workspace-folder .
-
-tmux rename-window nvim
-tmux new-window -n "ros" "devcontainer exec --workspace-folder . bash"
-tmux new-window -n "shell"
-tmux select-window -t :-2
-
-devcontainer exec --workspace-folder . nvim

tmux/.stow-local-ignore

@@ -1,2 +1,2 @@
 gruvbox.conf
-tpm
+tpm/

tmux/dot-tmux.conf

@@ -1,18 +1,12 @@
 # Plugins
 set -g @plugin 'mrjones2014/smart-splits.nvim'
 set -g @plugin 'tmux-plugins/tmux-sensible'
-set -g @plugin 'wfxr/tmux-fzf-url'
 
 # Settings
 set -ag terminal-overrides ",xterm-256color:RGB"
 setw -g monitor-activity on
 setw -g automatic-rename on
 set-window-option -g xterm-keys on
-set -sg escape-time 0
-
-set -g history-limit 5000
-
-set -g detach-on-destroy off  # don't exit from tmux when closing a session
 
 # Setup vi-mode with better keybindings
 # TODO: Escape does not work properly for leaving
@@ -64,20 +58,3 @@ wg_is_keys_off="#([ $(tmux show-option -qv key-table) = 'off' ] && echo 'TRUE' )
 source-file "$DOTFILES/tmux/gruvbox.conf"
 
 run "$DOTFILES/tmux/tpm/tpm"
-
-set -g base-index 1
-bind-key -n M-1 select-window -t 1
-bind-key -n M-2 select-window -t 2
-bind-key -n M-3 select-window -t 3
-bind-key -n M-4 select-window -t 4
-bind-key -n M-5 select-window -t 5
-bind-key -n M-6 select-window -t 6
-bind-key -n M-7 select-window -t 7
-bind-key -n M-8 select-window -t 8
-bind-key -n M-9 select-window -t 9
-bind-key -n M-0 select-window -t 10
-
-bind-key "a" run-shell "sesh-select"
-
-bind-key x kill-pane
-bind-key X kill-session

zsh/dot-zshrc

@@ -22,10 +22,10 @@ plugins=(
 	# Disabled because the highlighting conflicts with autosuggestions
 	# history-substring-search
 	vi-mode
+	tmux
 	colored-man-pages
 	command-not-found
-	zsh-autopair
+	dirhistory
-	fast-syntax-highlighting
 )
 
 bindkey -M vicmd "k" up-line-or-beginning-search
@@ -35,19 +35,18 @@ HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="fg=yellow"
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND="fg=red"
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_TIMEOUT=3
 
-ZSH_AUTOSUGGEST_STRATEGY=(history completion)
-
 VI_MODE_RESET_PROMPT_ON_MODE_CHANGE=true
 VI_MODE_SET_CURSOR=true
 # Might cause issues?
 KEYTIMEOUT=1
 
-fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
+ZSH_TMUX_AUTOSTART=true
-autoload -U compinit && compinit
+ZSH_TMUX_AUTOCONNECT=false
-source "$ZSH/oh-my-zsh.sh"
+ZSH_TMUX_FIXTERM=true
+
+source $ZSH/oh-my-zsh.sh
 
 less_termcap[so]="${fg_bold[black]}${bg[white]}"
-export LESS="-F -R -i --incsearch -M"
 
 export PATH="${HOME}/.local/bin:${HOME}/.cargo/bin:$PATH"
 export EDITOR=nvim
@@ -55,27 +54,14 @@ export EDITOR=nvim
 
 alias cl="clear"
 
-if (( $+commands[bat] )); then
+if hash devcontainer 2>/dev/null; then
-	export BAT_THEME="gruvbox-dark"
-	alias cat=bat
-fi
-
-if (( $+commands[devcontainer] )); then
 	dc() {
 	  ORIG_DIR="$PWD"
 	  while [[ "$PWD" != / ]] ; do
 		if find "$PWD"/ -maxdepth 1 -type d -name ".devcontainer" | grep -q ".devcontainer"; then
 		  WORKSPACE_FOLDER="$PWD"
 		  builtin cd "$ORIG_DIR"
-
+		  devcontainer exec --workspace-folder "$WORKSPACE_FOLDER" $@
-		  if [[ "$1" == "nvim" ]]; then
-			  tmux set-option -pt 0 @pane-is-vim 1
-			  devcontainer exec --workspace-folder "$WORKSPACE_FOLDER" bash -c "$@"
-			  tmux set-option -pt 0 @pane-is-vim 0
-		  else
-			  devcontainer exec --workspace-folder "$WORKSPACE_FOLDER" $@
-		  fi
-
 		  return 0
 		else
 		  builtin cd ..
@@ -87,67 +73,10 @@ if (( $+commands[devcontainer] )); then
 	}
 fi
 
-export PNPM_HOME="/home/tim/.local/share/pnpm"
+if hash pnpm 2>/dev/null; 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
-
-export FZF_DEFAULT_OPTS='--tmux'
-export FZF_DEFAULT_OPTS=$FZF_DEFAULT_OPTS'
-  --color=fg:-1,fg+:#83a598,bg:-1,bg+:#262626
-  --color=hl:bold:#8ec07c,hl+:#8ec07c,marker:#cc241d
-  --color=prompt:#fb4934,spinner:#af5fff,pointer:#83a598,header:#87afaf
-  --color=border:#7c6f64,label:#7c6f64
-  --border="sharp" --border-label-pos="0" --preview-window="border-sharp"
-  --prompt="> " --marker="◆" --pointer=">" --separator="─"
-  --scrollbar="│" --info="right"'
-
-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
-	source <(fzf --zsh)
-
-	if (( $+commands[paru] )); then
-		function pi {
-			paru -Slq | fzf -q "$1" --border-label=" Install package " --multi --preview 'paru -Si {1} --color=always' | xargs -ro paru -S
-		}
-	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
-			sesh-select
-		else
-			tmux new-session
-		fi
-		exit
-	fi
 fi