From d7f52c9aaee49f62f9e3a2a410ca21eb5e4b1649 Mon Sep 17 00:00:00 2001 From: Tom van der Lee 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/autocmds.lua | 22 +++++++++++++++++ neovim/.config/nvim/lua/config/keymaps.lua | 37 +++++++++++++++++++++++++++++ neovim/.config/nvim/lua/config/lazy.lua | 17 +++++++++++++ neovim/.config/nvim/lua/config/options.lua | 36 ++++++++++++++++++++++++++++ 4 files changed, 112 insertions(+) create mode 100644 neovim/.config/nvim/lua/config/autocmds.lua create mode 100644 neovim/.config/nvim/lua/config/keymaps.lua create mode 100644 neovim/.config/nvim/lua/config/lazy.lua create mode 100644 neovim/.config/nvim/lua/config/options.lua (limited to 'neovim/.config/nvim/lua/config') diff --git a/neovim/.config/nvim/lua/config/autocmds.lua b/neovim/.config/nvim/lua/config/autocmds.lua new file mode 100644 index 0000000..7bc4f6b --- /dev/null +++ b/neovim/.config/nvim/lua/config/autocmds.lua @@ -0,0 +1,22 @@ +-- Remove trailing spaces on save, preserving cursor and search pattern +local function strip_trailing_whitespace() + if vim.list_contains({ "markdown", "diff" }, vim.bo.filetype) then + return + end + local view = vim.fn.winsaveview() + vim.cmd([[keeppatterns %s/\s\+$//e]]) + vim.fn.winrestview(view) +end + +vim.api.nvim_create_autocmd("BufWritePre", { + pattern = "*", + callback = strip_trailing_whitespace, +}) + +-- Note: the colorscheme (with its "desert" fallback) is applied from +-- lua/plugins/colorscheme.lua's own `config` function, not here — under +-- lazy.nvim that's the natural place to react to "the plugin is now loaded". +-- +-- Note: the vimrc's "reload vimrc on save" autocmd has no clean Lua +-- equivalent (module caching means `require()`-based configs aren't simply +-- re-sourceable) and is deliberately not ported. 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 +map("n", "", "j") +map("n", "", "k") +map("n", "", "h") +map("n", "", "l") + +-- Never use the arrow keys +for _, key in ipairs({ "", "", "", "" }) do + map({ "n", "i" }, key, "") +end + +-- Disable ex mode +map("n", "Q", "") + +-- 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 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 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", "ml", append_modeline, { silent = true }) diff --git a/neovim/.config/nvim/lua/config/lazy.lua b/neovim/.config/nvim/lua/config/lazy.lua new file mode 100644 index 0000000..5a645c1 --- /dev/null +++ b/neovim/.config/nvim/lua/config/lazy.lua @@ -0,0 +1,17 @@ +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.uv.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup("plugins", { + install = { colorscheme = { "janah", "desert" } }, + checker = { enabled = false }, +}) diff --git a/neovim/.config/nvim/lua/config/options.lua b/neovim/.config/nvim/lua/config/options.lua new file mode 100644 index 0000000..be614e1 --- /dev/null +++ b/neovim/.config/nvim/lua/config/options.lua @@ -0,0 +1,36 @@ +-- Ported from vim/.vim/vimrc's "DEFAULT VIM SETTINGS" block. `syntax on` and +-- `filetype plugin indent on` are intentionally omitted: both are Neovim +-- defaults (see `:help nvim-defaults`). + +local opt = vim.opt + +opt.number = true +opt.relativenumber = true +opt.list = true +opt.modeline = true +opt.background = "dark" +opt.foldmethod = "indent" +opt.listchars = { trail = "·", tab = "▸ ", eol = "¬" } +opt.scrolloff = 1 +opt.backspace = { "indent", "eol", "start" } +opt.cursorline = true +opt.hidden = true -- already Neovim's default; set explicitly for parity with the vimrc +opt.wildmenu = true -- already Neovim's default; set explicitly for parity with the vimrc + +-- Faster gutter updates (signify) and snappier +opt.updatetime = 100 +opt.ttimeoutlen = 10 + +-- Persistent undo across sessions +local undodir = vim.fn.stdpath("data") .. "/undo" +if vim.fn.isdirectory(undodir) == 0 then + vim.fn.mkdir(undodir, "p", "0700") +end +opt.undofile = true +opt.undodir = undodir + +-- Search-related things +opt.hlsearch = true +opt.incsearch = true +opt.ignorecase = true +opt.smartcase = true -- cgit v1.3