Merge branch 'main' of https://github.com/greggh/nvim

Author: greggh

CHANGELOG.md

@@ -85,4 +85,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initial configuration setup
 - Core plugin ecosystem
 - Basic keybindings and settings
-- Modular organization
+- Modular organization

lua/config/keymaps.lua

@@ -17,8 +17,7 @@ local function get_snacks()
 end
 
 local builtin_map = {
-  -- Command mode tab completion
-  ["c|<tab>"] = map_cmd("<C-z>"):with_noremap():with_desc("edit: Command completion"),
+  -- Command mode tab completion ["c|<tab>"] = map_cmd("<C-z>"):with_noremap():with_desc("edit: Command completion"),
 
   -- fix stupid typo
   ["n|q:"] = map_cmd("<Cmd>q<CR>"):with_noremap():with_silent():with_desc("edit: Quit"),
@@ -212,10 +211,10 @@ local plug_map = {
   ["n|<A-j>"] = map_cu("SmartResizeDown"):with_silent():with_noremap():with_desc("window: Resize -3 down"),
   ["n|<A-k>"] = map_cu("SmartResizeUp"):with_silent():with_noremap():with_desc("window: Resize +3 up"),
   ["n|<A-l>"] = map_cu("SmartResizeRight"):with_silent():with_noremap():with_desc("window: Resize +3 right"),
-  ["n|<C-h>"] = map_cu("SmartCursorMoveLeft"):with_silent():with_noremap():with_desc("window: Focus left"),
-  ["n|<C-j>"] = map_cu("SmartCursorMoveDown"):with_silent():with_noremap():with_desc("window: Focus down"),
-  ["n|<C-k>"] = map_cu("SmartCursorMoveUp"):with_silent():with_noremap():with_desc("window: Focus up"),
-  ["n|<C-l>"] = map_cu("SmartCursorMoveRight"):with_silent():with_noremap():with_desc("window: Focus right"),
+  ["n|<C-h>"] = map_cu("wincmd h"):with_silent():with_noremap():with_desc("window: Focus left"),
+  ["n|<C-j>"] = map_cu("wincmd j"):with_silent():with_noremap():with_desc("window: Focus down"),
+  ["n|<C-k>"] = map_cu("wincmd k"):with_silent():with_noremap():with_desc("window: Focus up"),
+  ["n|<C-l>"] = map_cu("wincmd l"):with_silent():with_noremap():with_desc("window: Focus right"),
   ["n|<leader>wh"] = map_cu("SmartSwapLeft"):with_silent():with_noremap():with_desc("window: Move window left"),
   ["n|<leader>wj"] = map_cu("SmartSwapDown"):with_silent():with_noremap():with_desc("window: Move window down"),
   ["n|<leader>wk"] = map_cu("SmartSwapUp"):with_silent():with_noremap():with_desc("window: Move window up"),

lua/plugins/ai/avante.lua

@@ -30,9 +30,9 @@ return {
   config = function()
     require("avante_lib").load()
     require("avante").setup({
-      provider = "claude",
-      vendors = {
-        ["ollama"] = {
+      providers = {
+        claude = {},
+        ollama = {
           __inherited_from = "openai",
           api_key_name = "",
           endpoint = "http://192.168.1.197:11434/v1",

lua/plugins/blink-cmp.lua

@@ -132,9 +132,34 @@ return {
     snippets = { preset = "luasnip" },
 
     cmdline = {
-      sources = {},
-    },
+      enabled = true,
+      keymap = { preset = "cmdline" },
+      sources = { "buffer", "cmdline" },
 
+      completion = {
+        trigger = {
+          show_on_blocked_trigger_characters = {},
+          show_on_x_blocked_trigger_characters = {},
+        },
+        list = {
+          selection = {
+            -- When `true`, will automatically select the first item in the completion list
+            preselect = true,
+            -- When `true`, inserts the completion item automatically when selecting it
+            auto_insert = true,
+          },
+        },
+        -- Whether to automatically show the window when new completion items are available
+        -- Default is false for cmdline, true for cmdwin (command-line window)
+        menu = {
+          auto_show = function(ctx, _)
+            return ctx.mode == "cmdwin"
+          end,
+        },
+        -- Displays a preview of the selected item on the current line
+        ghost_text = { enabled = true },
+      },
+    },
     sources = {
       default = sources_default,
       per_filetype = {

lua/plugins/debugger/python-dap.lua

@@ -6,7 +6,7 @@ return {
     -- see: nvim-dap-ui issue #279
     require("dapui").setup()
     -- uses the debugypy installation by mason
-    local debugpyPythonPath = require("mason-registry").get_package("debugpy"):get_install_path() .. "/venv/bin/python3"
+    local debugpyPythonPath = vim.fn.expand("$MASON/bin/kotlin-debug-adapter") .. "/venv/bin/python3"
     require("dap-python").setup(debugpyPythonPath, {}) ---@diagnostic disable-line: missing-fields
   end,
 }

lua/plugins/lsp.lua

@@ -164,10 +164,10 @@ return {
     ---------------------
     -- memory limiting for LSP servers
     ---------------------
-    local function get_memory_limit_mb()
-      -- Adapt based on available system memory
-      return 1024 -- 1GB limit for LSP servers
-    end
+    -- local function get_memory_limit_mb()
+    --   -- Adapt based on available system memory
+    --   return 1024 -- 1GB limit for LSP servers
+    -- end
 
     ---------------------
     -- mason