From d7f52c9aaee49f62f9e3a2a410ca21eb5e4b1649 Mon Sep 17 00:00:00 2001
From: Tom van der Lee <t0m.vd.l33@gmail.com>
Date: Thu, 10 Sep 2026 21:54:47 +0200
Subject: Add standalone Neovim Lua config

Replace the neovim stow package's symlink into vim/.vim with a real,
independent Lua config: init.lua + lua/config/* (options, keymaps,
autocmds, lazy.nvim bootstrap) + lua/plugins/*.lua (one file per plugin
group).

- Plugin manager: lazy.nvim (self-bootstrapping, no submodule needed).
- Carries over every plugin from the vimrc as-is: vim-airline (+ themes,
  tmuxline), vim-janah colorscheme, nerdtree, vim-signify, nerdcommenter,
  ale, vim-fugitive, quick-scope, ctrlp.vim, claude-code.nvim, plus
  vim-ansible-yaml/vim-terraform gated the same way the vimrc gated them
  (executable() checks, now as lazy.nvim `cond` functions).
- Replaces YouCompleteMe + jedi-vim entirely with nvim-lspconfig +
  mason.nvim + mason-lspconfig.nvim (ensure_installed: pyright, lua_ls,
  bashls, terraformls, yamlls, ts_ls, cssls, html; clangd enabled
  directly since it's already on PATH via Xcode CLT) and blink.cmp for
  completion (+ friendly-snippets), with blink's LSP capabilities merged
  into every server's default config.
- ALE stays as a pure linter/fixer (g:ale_disable_lsp = 1) so it doesn't
  duplicate nvim-lspconfig's diagnostics/hover/go-to-definition.
- Ports the vimrc's general settings/functions (options, window-nav
  keymaps, arrow-key disabling, StripTrailingWhitespace, AppendModeline,
  the git->Git abbreviation) to Lua; drops the w!! sudo-save abbreviation
  (vimrc's own comment notes it doesn't work under Neovim) and the
  reload-vimrc-on-save autocmd (no clean Lua equivalent).

Vim's own vimrc, ftplugin/python.vim, and plugin installs are completely
untouched and unaffected by this change.
---
 neovim/.config/nvim/lua/plugins/lsp.lua | 36 +++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 neovim/.config/nvim/lua/plugins/lsp.lua

(limited to 'neovim/.config/nvim/lua/plugins/lsp.lua')

diff --git a/neovim/.config/nvim/lua/plugins/lsp.lua b/neovim/.config/nvim/lua/plugins/lsp.lua
new file mode 100644
index 0000000..0463dde
--- /dev/null
+++ b/neovim/.config/nvim/lua/plugins/lsp.lua
@@ -0,0 +1,36 @@
+return {
+  "mason-org/mason-lspconfig.nvim",
+  dependencies = {
+    { "mason-org/mason.nvim", opts = {} },
+    "neovim/nvim-lspconfig",
+    "saghen/blink.cmp",
+  },
+  opts = {
+    ensure_installed = {
+      "pyright",
+      "lua_ls",
+      "bashls",
+      "terraformls",
+      "yamlls",
+      "ts_ls",
+      "cssls",
+      "html",
+    },
+    -- default true: auto-calls vim.lsp.enable() for every Mason-installed
+    -- server as it finishes installing.
+  },
+  config = function(_, opts)
+    -- Merge blink.cmp's LSP capabilities into every server's default config
+    -- (Mason-managed or not) before any server gets enabled.
+    vim.lsp.config("*", {
+      capabilities = require("blink.cmp").get_lsp_capabilities(),
+    })
+
+    require("mason-lspconfig").setup(opts)
+
+    -- clangd ships with Xcode Command Line Tools already, so it's not
+    -- Mason-managed — nvim-lspconfig provides its default config, we just
+    -- need to turn it on.
+    vim.lsp.enable("clangd")
+  end,
+}
-- 
cgit v1.3