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/config/keymaps.lua | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 neovim/.config/nvim/lua/config/keymaps.lua

(limited to 'neovim/.config/nvim/lua/config/keymaps.lua')

diff --git a/neovim/.config/nvim/lua/config/keymaps.lua b/neovim/.config/nvim/lua/config/keymaps.lua
new file mode 100644
index 0000000..f0bfbec
--- /dev/null
+++ b/neovim/.config/nvim/lua/config/keymaps.lua
@@ -0,0 +1,37 @@
+local map = vim.keymap.set
+
+-- Switch windows with <C-[direction]>
+map("n", "<C-j>", "<C-w>j")
+map("n", "<C-k>", "<C-w>k")
+map("n", "<C-h>", "<C-w>h")
+map("n", "<C-l>", "<C-w>l")
+
+-- Never use the arrow keys
+for _, key in ipairs({ "<Up>", "<Down>", "<Left>", "<Right>" }) do
+  map({ "n", "i" }, key, "<Nop>")
+end
+
+-- Disable ex mode
+map("n", "Q", "<Nop>")
+
+-- Expand :git to fugitive's :Git, but only as a whole command.
+-- (No Lua-native abbreviation API exists, so this stays a thin vim.cmd call.)
+vim.cmd([[cnoreabbrev <expr> git (getcmdtype() ==# ':' && getcmdline() ==# 'git') ? 'Git' : 'git']])
+
+-- Note: the vimrc's `w!!` sudo-save abbreviation is deliberately NOT ported
+-- here — its own comment says it doesn't work under Neovim (sudo can't
+-- prompt for a password there).
+
+-- Append modeline when pressing <leader>ml
+local function append_modeline()
+  local modeline = string.format(
+    " vim: set ts=%d sw=%d tw=%d %set :",
+    vim.bo.tabstop,
+    vim.bo.shiftwidth,
+    vim.bo.textwidth,
+    vim.bo.expandtab and "" or "no"
+  )
+  modeline = vim.bo.commentstring:gsub("%%s", modeline)
+  vim.api.nvim_buf_set_lines(0, -1, -1, false, { modeline })
+end
+map("n", "<leader>ml", append_modeline, { silent = true })
-- 
cgit v1.3