@sebastienrousseau/dotfiles 0.2.481 → 0.2.500

package/dot_config/nushell/env.nu.tmpl

@@ -0,0 +1,94 @@
+# 🅳🅾🆃🅵🅸🅻🅴🆂 (v{{ .dotfiles_version }}) - Nushell Environment
+# <https://dotfiles.io>
+
+# Define basic environment variables
+$env.HOSTNAME = (sys host | get hostname)
+$env.OS_ARCH = (sys host | get arch)
+$env.OS_NAME = (sys host | get name)
+$env.USER_LANGUAGE = "en_GB.UTF-8"
+$env.DOTFILES_VERSION = '{{ .dotfiles_version }}'
+$env.LANG = $env.USER_LANGUAGE
+$env.TERM = "xterm-256color"
+
+# Path setup: Nushell handles paths as a list in $env.PATH
+let paths = [
+    $"($env.HOME)/.local/bin",
+    $"($env.HOME)/bin",
+    "/opt/homebrew/bin",
+    "/opt/homebrew/sbin",
+    $"($env.HOME)/.cargo/bin",
+    $"($env.HOME)/go/bin",
+    $"($env.HOME)/.bun/bin",
+    "/usr/local/bin",
+    "/usr/bin",
+    "/bin",
+    "/usr/sbin",
+    "/sbin"
+]
+
+$env.PATH = ($env.PATH | split row (char esep) | append $paths | uniq)
+
+# Setup shell tool integrations
+mkdir ~/.cache/nushell
+
+# Starship prompt
+if (which starship | length) > 0 {
+    starship init nu | save -f ~/.cache/nushell/starship.nu
+} else {
+    "" | save -f ~/.cache/nushell/starship.nu
+}
+
+# Zoxide directory jumper
+if (which zoxide | length) > 0 {
+    zoxide init nushell | save -f ~/.cache/nushell/zoxide.nu
+} else {
+    "" | save -f ~/.cache/nushell/zoxide.nu
+}
+
+# Atuin shell history
+if (which atuin | length) > 0 {
+    atuin init nu | save -f ~/.cache/nushell/atuin.nu
+} else {
+    "" | save -f ~/.cache/nushell/atuin.nu
+}
+
+# Generate Nushell alias cache from bash alias library
+do -i {
+    bash --norc --noprofile -c '
+        source "$HOME/.config/shell/90-ux-aliases.sh" 2>/dev/null
+        source "$HOME/.config/shell/91-ux-aliases-lazy.sh" 2>/dev/null
+        alias -p 2>/dev/null | while IFS= read -r line; do
+            name="${line#alias }"
+            name="${name#-- }"
+            name="${name%%=*}"
+            # Only valid Nushell identifiers (letters, digits, hyphens, underscores)
+            [[ "$name" =~ ^[a-zA-Z_][a-zA-Z0-9_-]*$ ]] || continue
+            val="${line#*=}"
+            # Remove surrounding single quotes from bash alias output
+            val="${val#\'}"
+            val="${val%\'}"
+            # Skip syntax incompatible with Nushell aliases
+            case "$val" in
+                *\$\{*|*\$\(*) continue ;;
+                *\`*) continue ;;
+                *"[["*|*"&&"*|*"||"*) continue ;;
+                *";"*|*"|"*) continue ;;
+                *">"*|*"<"*) continue ;;
+                *"("*|*")"*) continue ;;
+                "") continue ;;
+            esac
+            printf "alias %s = %s\n" "$name" "$val"
+        done
+    ' | save -f ~/.cache/nushell/bash-aliases.nu
+}
+# Carapace multi-shell completions
+if (which carapace | length) > 0 {
+    carapace _carapace nushell | save -f ~/.cache/nushell/carapace.nu
+} else {
+    "" | save -f ~/.cache/nushell/carapace.nu
+}
+
+# Ensure alias cache exists even if bash bridge failed
+if not ($"($env.HOME)/.cache/nushell/bash-aliases.nu" | path exists) {
+    "" | save -f ~/.cache/nushell/bash-aliases.nu
+}

package/dot_config/nushell/functions.nu.tmpl

@@ -0,0 +1,17 @@
+{{- $root := . -}}
+{{- $groupsPath := joinPath $root.chezmoi.sourceDir ".chezmoitemplates/functions/groups.json" -}}
+{{- $groups := (fromJson (include $groupsPath)) -}}
+# Nushell function wrappers (Generated by Chezmoi)
+# Delegates to bash function library in ~/.config/shell/50-logic-functions.sh
+# Edit .chezmoitemplates/functions/ source files, not this file.
+
+{{ range $group, $files := $groups -}}
+# --- {{ $group }} ---
+{{ range $files -}}
+{{ $func := trimSuffix ".sh" (base .) -}}
+def {{ $func }} [...args] {
+    bash -c $'source "$HOME/.config/shell/50-logic-functions.sh" 2>/dev/null; {{ $func }} "$@"' -- ...$args
+}
+
+{{ end -}}
+{{ end -}}

package/dot_config/nvim/init.lua

@@ -1,3 +1,17 @@
+-- Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+
+-- Require Neovim >= 0.11.2 for native LSP improvements and vim.snippet
+if vim.fn.has("nvim-0.11.2") ~= 1 then
+  vim.api.nvim_echo({
+    { "Dotfiles Neovim config requires Neovim >= 0.11.2\n", "ErrorMsg" },
+    {
+      "Current: " .. vim.version().major .. "." .. vim.version().minor .. "." .. vim.version().patch .. "\n",
+      "WarningMsg",
+    },
+  }, true, {})
+  return
+end
+
 require("config.options")
 require("config.lazy")
 require("config.keymaps")

package/dot_config/nvim/lazy-lock.json

@@ -1,27 +1,58 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" },
-  "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
-  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
-  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
-  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" },
+  "CopilotChat.nvim": { "branch": "main", "commit": "ecea24a9a067c6f176b8e13eb11251c739caf055" },
+  "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "catppuccin": { "branch": "main", "commit": "384f304c8b04664c9e0091fbfb3923c5f97c1bcf" },
+  "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
+  "copilot.lua": { "branch": "master", "commit": "8e2a91828210d6043744468f6d7027d256a41f42" },
   "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
+  "dracula": { "branch": "main", "commit": "ae752c13e95fb7c5f58da4b5123cb804ea7568ee" },
+  "everforest": { "branch": "master", "commit": "b03a03148c8b34c24c96960b93da9c8883d11f54" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
+  "gruvbox": { "branch": "main", "commit": "334d5fd49fc8033f26408425366c66c6390c57bb" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
+  "kanagawa": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "4823a251e7578a835bb979c37df390fca692ba39" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" },
+  "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
   "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "neogen": { "branch": "main", "commit": "23e7e9f883d01289ebd90e98025acc860ea26366" },
+  "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
+  "neotest-plenary": { "branch": "master", "commit": "3523adcf9ffaad1911960c5813b0136c1b63a2ec" },
+  "neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" },
+  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
+  "nord": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-cmp": { "branch": "main", "commit": "85bbfad83f804f11688d1ab9486b459e699292d6" },
-  "nvim-dap": { "branch": "master", "commit": "085386b9359ddf8d76ad89b98973b8e332dc5ba3" },
+  "nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" },
+  "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
   "nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
   "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
-  "nvim-lspconfig": { "branch": "master", "commit": "dec357ee48ff7e2e5b76898fd7c67b61a627d3ac" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" },
+  "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" },
+  "nvim-lspconfig": { "branch": "master", "commit": "dd261ad5266ab5bbec249d21efeceda98ff3e1a6" },
   "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
+  "nvim-scrollbar": { "branch": "main", "commit": "f8e87b96cd6362ef8579be456afee3b38fd7e2a8" },
+  "nvim-tree.lua": { "branch": "master", "commit": "b3772adec8db61ba9098c5624a0823a77be3a23d" },
+  "nvim-treesitter": { "branch": "main", "commit": "2f5d4c3f3c675962242096bcc8e586d76dd72eb2" },
+  "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
+  "one-small-step-for-vimkind": { "branch": "main", "commit": "1af6ffb9b5229a856e8090fa2f690e0931a5aace" },
+  "onedark": { "branch": "master", "commit": "213c23ae45a04797572242568d5d51937181792d" },
+  "outline.nvim": { "branch": "main", "commit": "ead1820d49c8e79ce89cab1c2c318981b695c9d2" },
+  "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" },
   "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "snacks.nvim": { "branch": "main", "commit": "a049339328e2599ad6e85a69fa034ac501e921b2" },
+  "solarized": { "branch": "main", "commit": "c0dfe1cbfabd93b546baf5f1408f5df7e02e2050" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
+  "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
+  "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
+  "tokyonight": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "venv-selector.nvim": { "branch": "main", "commit": "42e8faadf9b819654f29eb1a785797a3a328f301" },
+  "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" },
   "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }

package/dot_config/nvim/lua/config/autocmds.lua

@@ -1,3 +1,4 @@
+-- Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 -- Check if we need to reload the file when it changed
 vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, {
   command = "checktime",
@@ -57,7 +58,50 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, {
     if event.match:match("^%w%w+://") then
       return
     end
-    local file = vim.loop.fs_realpath(event.match) or event.match
+    local file = vim.uv.fs_realpath(event.match) or event.match
     vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
   end,
 })
+
+-- Theme hot-reload: clear cached modules and reapply colorscheme on LazyReload.
+-- Prevents stale theme state when dot-theme-sync sends a colorscheme change.
+vim.api.nvim_create_autocmd("User", {
+  pattern = "LazyReload",
+  callback = function()
+    local theme = vim.env.DOTFILES_THEME or "macos-monterey-dark"
+    -- Clear cached theme modules so setup() runs fresh
+    for name, _ in pairs(package.loaded) do
+      if
+        name:match("^catppuccin")
+        or name:match("^tokyonight")
+        or name:match("^kanagawa")
+        or name:match("^gruvbox")
+        or name:match("^rose%-pine")
+        or name:match("^solarized")
+        or name:match("^onedark")
+        or name:match("^nord")
+        or name:match("^dracula")
+        or name:match("^everforest")
+      then
+        package.loaded[name] = nil
+      end
+    end
+    -- Defer to let lazy.nvim finish its reload cycle
+    vim.defer_fn(function()
+      local cs = theme:match("^catppuccin") and "catppuccin" or theme:match("^tokyonight") and theme or theme
+      pcall(vim.cmd.colorscheme, cs)
+    end, 5)
+  end,
+})
+
+-- Cursorline only on focused window
+vim.api.nvim_create_autocmd({ "WinEnter", "BufEnter" }, {
+  callback = function()
+    vim.wo.cursorline = true
+  end,
+})
+vim.api.nvim_create_autocmd({ "WinLeave" }, {
+  callback = function()
+    vim.wo.cursorline = false
+  end,
+})

package/dot_config/nvim/lua/config/keymaps.lua

@@ -1,3 +1,4 @@
+-- Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 local map = vim.keymap.set
 
 -- Better window navigation
@@ -38,6 +39,14 @@ map({ "i", "x", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save file" })
 map("v", "<", "<gv")
 map("v", ">", ">gv")
 
+-- Delete to void register (prevent clipboard pollution)
+map({ "n", "v" }, "x", '"_x', { desc = "Delete char (void register)" })
+map({ "n", "v" }, "X", '"_X', { desc = "Delete char backward (void register)" })
+map("n", "Del", '"_x', { desc = "Delete char (void register)" })
+
+-- Paste over selection without clobbering register
+map("v", "p", "P", { desc = "Paste (keep register)" })
+
 -- Lazy
 map("n", "<leader>l", "<cmd>Lazy<cr>", { desc = "Lazy" })
 
@@ -50,16 +59,15 @@ map("n", "<leader>pr", ":w<CR>:!python3 %<CR>", { desc = "Run Python file" })
 map("n", "<leader>pi", ":VenvSelect<CR>", { desc = "Select Python Env" })
 map("n", "<leader>pt", ":!pytest<CR>", { desc = "Run Pytest" })
 
--- LSP (Global fallback, though logic primarily handled by specific plugins)
+-- LSP (Global fallback; <leader>cf owned by conform.nvim in plugins/lsp.lua)
 map("n", "<leader>ca", vim.lsp.buf.code_action, { desc = "Code actions" })
-map("n", "<leader>cf", vim.lsp.buf.format, { desc = "Format code" })
 map("n", "<leader>cr", vim.lsp.buf.rename, { desc = "Rename symbol" })
 
 -- Telescope
 map("n", "<leader>ff", ":Telescope find_files<CR>", { desc = "Find files" })
 map("n", "<leader>fg", ":Telescope live_grep<CR>", { desc = "Find text" })
-map("n", "<leader>fb", ":Telescope file_browser<CR>", { desc = "File browser" })
-map("n", "<leader>fp", ":Telescope project<CR>", { desc = "Projects" })
+map("n", "<leader>fb", ":Telescope buffers<CR>", { desc = "Buffers" })
+map("n", "<leader>fp", ":Telescope oldfiles<CR>", { desc = "Recent files" })
 map("n", "<leader>gw", ":Telescope git_worktree git_worktrees<CR>", { desc = "Worktrees" })
 map("n", "<leader>gW", ":Telescope git_worktree create_git_worktree<CR>", { desc = "Create worktree" })
 
@@ -67,10 +75,7 @@ map("n", "<leader>gW", ":Telescope git_worktree create_git_worktree<CR>", { desc
 map("n", "<leader>tt", ":ToggleTerm direction=float<CR>", { desc = "Toggle terminal" })
 map("t", "<Esc>", "<C-\\><C-n>", { desc = "Exit terminal mode" })
 
--- Testing (Neotest)
-map("n", "<leader>tn", ":TestNearest<CR>", { desc = "Test nearest" })
-map("n", "<leader>tf", ":TestFile<CR>", { desc = "Test file" })
-map("n", "<leader>ts", ":TestSuite<CR>", { desc = "Test suite" })
+-- Testing keymaps owned by neotest in plugins/coding.lua
 
 -- Debugging (DAP)
 map("n", "<F5>", function()

package/dot_config/nvim/lua/config/lazy.lua

@@ -1,20 +1,30 @@
+-- Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable",
-    lazypath,
-  })
+if not vim.uv.fs_stat(lazypath) then
+  vim
+    .system({
+      "git",
+      "clone",
+      "--filter=blob:none",
+      "https://github.com/folke/lazy.nvim.git",
+      "--branch=stable",
+      lazypath,
+    })
+    :wait()
 end
 vim.opt.rtp:prepend(lazypath)
 
+-- User-local plugin specs (not managed by chezmoi)
+local _lazy_spec = {
+  { import = "plugins" },
+}
+local _user_plugins = vim.fn.stdpath("config") .. "/lua/plugins.local"
+if vim.uv.fs_stat(_user_plugins) then
+  table.insert(_lazy_spec, { import = "plugins.local" })
+end
+
 require("lazy").setup({
-  spec = {
-    { import = "plugins" },
-  },
+  spec = _lazy_spec,
   defaults = {
     lazy = false,
     version = false,

package/dot_config/nvim/lua/config/options.lua

@@ -1,3 +1,4 @@
+-- Copyright (c) 2015-2026 Dotfiles. All rights reserved.
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 

package/dot_config/nvim/lua/plugins/ai.lua

@@ -0,0 +1,75 @@
+-- Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+-- AI-assisted coding plugins
+-- Loaded when ai_tools feature is enabled in .chezmoidata.toml
+
+return {
+  -- GitHub Copilot: AI code completion
+  {
+    "zbirenbaum/copilot.lua",
+    cmd = "Copilot",
+    event = "InsertEnter",
+    config = function()
+      require("copilot").setup({
+        suggestion = {
+          enabled = true,
+          auto_trigger = true,
+          keymap = {
+            accept = "<M-l>",
+            accept_word = "<M-k>",
+            accept_line = "<M-j>",
+            next = "<M-]>",
+            prev = "<M-[>",
+            dismiss = "<C-]>",
+          },
+        },
+        panel = {
+          enabled = true,
+          auto_refresh = true,
+          keymap = {
+            open = "<M-CR>",
+          },
+        },
+        filetypes = {
+          yaml = true,
+          markdown = true,
+          gitcommit = true,
+          ["."] = false,
+        },
+      })
+    end,
+  },
+
+  -- Copilot Chat: interactive AI chat in a split
+  {
+    "CopilotC-Nvim/CopilotChat.nvim",
+    dependencies = {
+      "zbirenbaum/copilot.lua",
+      "nvim-lua/plenary.nvim",
+    },
+    cmd = {
+      "CopilotChat",
+      "CopilotChatExplain",
+      "CopilotChatReview",
+      "CopilotChatFix",
+      "CopilotChatOptimize",
+      "CopilotChatTests",
+      "CopilotChatDocs",
+    },
+    keys = {
+      { "<leader>aa", "<cmd>CopilotChat<CR>", desc = "AI Chat" },
+      { "<leader>ae", "<cmd>CopilotChatExplain<CR>", desc = "AI Explain", mode = { "n", "v" } },
+      { "<leader>ar", "<cmd>CopilotChatReview<CR>", desc = "AI Review", mode = { "n", "v" } },
+      { "<leader>af", "<cmd>CopilotChatFix<CR>", desc = "AI Fix", mode = { "n", "v" } },
+      { "<leader>ao", "<cmd>CopilotChatOptimize<CR>", desc = "AI Optimize", mode = { "n", "v" } },
+      { "<leader>at", "<cmd>CopilotChatTests<CR>", desc = "AI Tests", mode = { "n", "v" } },
+      { "<leader>ad", "<cmd>CopilotChatDocs<CR>", desc = "AI Docs", mode = { "n", "v" } },
+    },
+    opts = {
+      model = "gpt-4o",
+      window = {
+        layout = "vertical",
+        width = 0.3,
+      },
+    },
+  },
+}

package/dot_config/nvim/lua/plugins/coding.lua

@@ -1,3 +1,9 @@
+-- Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+-- @module nvim.plugins.coding
+-- Syntax, completion, and language intelligence plugins.
+-- Treesitter provides AST-based highlighting and text-objects.
+-- nvim-cmp drives the completion engine with LSP, snippet, and path sources.
+-- venv-selector enables Python virtualenv switching from within Neovim.
 return {
   -- Treesitter (Syntax Highlighting)
   {
@@ -41,7 +47,6 @@ return {
       "nvim-neotest/neotest-python",
       "nvim-neotest/neotest-plenary",
       "nvim-lua/plenary.nvim",
-      "antoinemadec/FixCursorHold.nvim",
       "nvim-treesitter/nvim-treesitter",
     },
     config = function()
@@ -82,19 +87,13 @@ return {
       "jbyuki/one-small-step-for-vimkind",
     },
     config = function()
-      local dap = require("dap")
-      local dapui = require("dapui")
       local dap_python = require("dap-python")
       local osv = require("osv")
 
-      -- Enhanced UI setup
-      dapui.setup()
+      -- DAP UI setup and listeners are in dap.lua (avoid duplication)
       require("nvim-dap-virtual-text").setup()
 
-      -- Python path resolution (Robust for Venv/System)
-      -- 1. Check for VIRTUAL_ENV env var
-      -- 2. Check for .venv directory
-      -- 3. Fallback to specific masonry path (if installed) or system python
+      -- Python path resolution
       local venv_path = os.getenv("VIRTUAL_ENV")
       local python_path
       if venv_path then
@@ -106,18 +105,8 @@ return {
       dap_python.setup(python_path)
       dap_python.test_runner = "pytest"
 
-      -- Auto-open UI
-      dap.listeners.after.event_initialized["dapui_config"] = function()
-        dapui.open()
-      end
-      dap.listeners.before.event_terminated["dapui_config"] = function()
-        dapui.close()
-      end
-      dap.listeners.before.event_exited["dapui_config"] = function()
-        dapui.close()
-      end
-
       -- Local Lua debugger (OSV)
+      local dap = require("dap")
       osv.setup({ port = 8086 })
       dap.adapters.nlua = function(callback, config)
         callback({ type = "server", host = config.host or "127.0.0.1", port = config.port or 8086 })
@@ -179,7 +168,7 @@ return {
       { "<leader>nd", ":Neogen<CR>", desc = "Generate Docstring" },
     },
     config = function()
-      require("neogen").setup({ snippet_engine = "luasnip" })
+      require("neogen").setup({ snippet_engine = "nvim" })
     end,
   },
 
@@ -207,17 +196,10 @@ return {
     end,
   },
   { "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
-  {
-    "ThePrimeagen/git-worktree.nvim",
-    config = function()
-      require("git-worktree").setup()
-    end,
-  },
-
   -- Venv Selector (Python Env Management)
   {
     "linux-cultist/venv-selector.nvim",
-    branch = "main", -- Explicitly switch back to main
+    version = false, -- No tagged releases; track default branch
     dependencies = {
       "neovim/nvim-lspconfig",
       "nvim-telescope/telescope.nvim",

package/dot_config/nvim/lua/plugins/completion.lua

@@ -0,0 +1,60 @@
+-- Copyright (c) 2015-2026 Dotfiles. All rights reserved.
+-- Completion engine: blink.cmp (replaces nvim-cmp + 6 plugins)
+-- https://github.com/Saghen/blink.cmp
+
+return {
+  {
+    "saghen/blink.cmp",
+    version = "1.*",
+    event = "InsertEnter",
+    dependencies = {
+      "rafamadriz/friendly-snippets",
+    },
+    opts = {
+      keymap = {
+        preset = "default",
+        ["<C-space>"] = { "show", "show_documentation", "hide_documentation" },
+        ["<C-e>"] = { "hide" },
+        ["<CR>"] = { "accept", "fallback" },
+        ["<Tab>"] = { "snippet_forward", "select_next", "fallback" },
+        ["<S-Tab>"] = { "snippet_backward", "select_prev", "fallback" },
+        ["<C-b>"] = { "scroll_documentation_up", "fallback" },
+        ["<C-f>"] = { "scroll_documentation_down", "fallback" },
+        ["<C-n>"] = { "select_next", "fallback" },
+        ["<C-p>"] = { "select_prev", "fallback" },
+      },
+      appearance = {
+        nerd_font_variant = "mono",
+      },
+      completion = {
+        accept = { auto_brackets = { enabled = true } },
+        documentation = {
+          auto_show = true,
+          auto_show_delay_ms = 200,
+          window = { border = "rounded" },
+        },
+        menu = {
+          border = "rounded",
+          draw = {
+            columns = {
+              { "kind_icon" },
+              { "label", "label_description", gap = 1 },
+            },
+          },
+        },
+        list = {
+          selection = { preselect = true, auto_insert = false },
+        },
+      },
+      sources = {
+        default = { "lsp", "path", "snippets", "buffer" },
+      },
+      snippets = { preset = "default" },
+      signature = {
+        enabled = true,
+        window = { border = "rounded" },
+      },
+    },
+    opts_extend = { "sources.default" },
+  },
+}