From 2d9ed00606be2f8c63aba719d00adf70fe6d4393 Mon Sep 17 00:00:00 2001
From: sommerfeld <sommerfeld@sommerfeld.dev>
Date: Wed, 20 May 2026 13:56:09 +0100
Subject: refactor(nvim,zsh): remove Mason; use Home-Manager-provisioned
 tooling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

LSPs, formatters, linters, and the lldb-dap debugger now come from
~/.nix-profile/bin (see nix/common.nix). lspconfig keeps the default
configs; we just opt-in via vim.lsp.enable() with an explicit list.

Changes:
  - dot_config/nvim/lua/plugins/lsp.lua: drop mason*, replace
    mason-lspconfig handler with explicit vim.lsp.enable({...}); drop
    groovy/jenkins formatters and lint entries; drop systemd lint
    (nginx + groovy + systemdlint tools dropped per plan).
  - dot_config/nvim/lua/plugins/debug.lua: drop mason-nvim-dap; drop
    codelldb adapter; switch dap.configurations.cpp to type='lldb'
    (lldb-dap is the upstream successor, ships with pkgs.lldb).
  - dot_config/nvim/init.lua: remove mason.nvim, mason-lspconfig.nvim,
    mason-tool-installer.nvim, mason-nvim-dap.nvim from vim.pack.add.
  - dot_config/nvim/lua/config/update.lua: remove MasonToolsUpdateSync.
  - dot_config/zsh/dot_zshrc: flip plugin source order — prefer
    ~/.nix-profile/share, fall back to /usr/share/zsh (was the other
    way around).
  - nix/bootstrap.sh: drop the uv-python3.11 step (no longer needed
    once Mason no longer source-builds Python LSPs on Ubuntu 20.04).

Phase 6 of the nix-on-host migration plan.
---
 dot_config/zsh/dot_zshrc | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'dot_config/zsh/dot_zshrc')

diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc
index b227c8f..f94b82e 100644
--- a/dot_config/zsh/dot_zshrc
+++ b/dot_config/zsh/dot_zshrc
@@ -418,7 +418,8 @@ _fzf_compgen_path() { fd --hidden --follow --exclude ".git" . "$1" }
 _fzf_compgen_dir()  { fd --type d --hidden --follow --exclude ".git" . "$1" }
 
 # ── Plugins (must be sourced last) ────────────────────────────────────────────
-# Plugin locations: Arch system path first, ~/.nix-profile fallback for VM HM.
+# Plugin locations: ~/.nix-profile (Home-Manager) first, Arch system path as
+# fallback for un-bootstrapped states.
 _source_first() {
 	local f
 	for f in "$@"; do
@@ -432,17 +433,17 @@ ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
 typeset -A ZSH_HIGHLIGHT_STYLES
 ZSH_HIGHLIGHT_STYLES[comment]='fg=yellow'
 _source_first \
-	/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
-	$HOME/.nix-profile/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+	$HOME/.nix-profile/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
+	/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 
 _source_first \
-	/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh \
-	$HOME/.nix-profile/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+	$HOME/.nix-profile/share/zsh-autosuggestions/zsh-autosuggestions.zsh \
+	/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
 bindkey '^[[Z' autosuggest-accept  # Shift-Tab to accept suggestion
 
 _source_first \
-	/usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh \
-	$HOME/.nix-profile/share/zsh-history-substring-search/zsh-history-substring-search.zsh
+	$HOME/.nix-profile/share/zsh-history-substring-search/zsh-history-substring-search.zsh \
+	/usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
 [[ -n "${key[Up]}"   ]] && bindkey -- "${key[Up]}"   history-substring-search-up
 [[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" history-substring-search-down
 
-- 
cgit v1.3.1