From e8882f87644da8fb9ba40d61d7b59a7a41b15fcf Mon Sep 17 00:00:00 2001 From: H2Shami Date: Fri, 14 Mar 2025 15:25:41 -0700 Subject: [PATCH] update preferences --- .aider.chat.history.md | 11 +++++++++++ .aider.input.history | 3 +++ init.lua | 24 +++++++++++++++++++++++- lua/custom/plugins/copilot.lua | 12 ++++++------ 4 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 .aider.chat.history.md create mode 100644 .aider.input.history diff --git a/.aider.chat.history.md b/.aider.chat.history.md new file mode 100644 index 00000000..da40b938 --- /dev/null +++ b/.aider.chat.history.md @@ -0,0 +1,11 @@ + +# aider chat started at 2025-03-12 11:22:11 + +> Newer aider version v0.76.2 is available. +> /Users/hammadshami/.local/share/uv/tools/aider-chat/bin/python -m pip install --upgrade --upgrade-strategy only-if-needed aider-chat +> Run pip install? (Y)es/(N)o [Yes]: y +> Re-run aider to use new version. + +# aider chat started at 2025-03-12 11:22:27 + +> You can skip this check with --no-gitignore diff --git a/.aider.input.history b/.aider.input.history new file mode 100644 index 00000000..cfb0a9e4 --- /dev/null +++ b/.aider.input.history @@ -0,0 +1,3 @@ + +# 2025-03-12 11:22:15.381378 ++y diff --git a/init.lua b/init.lua index 472abdef..b48d4c57 100644 --- a/init.lua +++ b/init.lua @@ -84,6 +84,15 @@ I hope you enjoy your Neovim journey, P.S. You can delete this when you're done too. It's your config now! :) --]] +-- Augment workspace folder config - recommended by augment +vim.g.augment_workspace_folders = { + '~/Work/JobZod/next_app/', + '~/Work/blumen_systems/reg_LLM/', + '~/Work/blumen_systems/blumen_next_ai/', + '~/Work/blumen_systems/lup_ingest/', + '~/Work/blumen_systems/geospatial/', +} + -- Set as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) @@ -196,6 +205,16 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the right win vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +-- keybinding to start Aider with the current file only as context +vim.keymap.set('n', 'ac', function() + local current_file = vim.fn.expand '%:p' + vim.cmd(string.format('AiderOpen %s', vim.fn.shellescape(current_file))) + -- Wait a bit before entering insert mode + vim.defer_fn(function() + vim.cmd 'startinsert' + end, 100) +end, { desc = 'Open Aider with current file' }) + -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -284,6 +303,8 @@ require('lazy').setup({ }, }, + { 'augmentcode/augment.vim' }, + { 'joshuavial/aider.nvim', opts = { @@ -864,7 +885,7 @@ require('lazy').setup({ -- Accept ([y]es) the completion. -- This will auto-import if your LSP supports it. -- This will expand snippets if the LSP sent a snippet. - [''] = cmp.mapping.confirm { select = true }, + [''] = cmp.mapping.confirm { select = true }, -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines @@ -976,6 +997,7 @@ require('lazy').setup({ -- Check out: https://github.com/echasnovski/mini.nvim end, }, + { 'ellisonleao/glow.nvim', config = true, cmd = 'Glow' }, { -- Highlight, edit, and navigate code 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua index c47ee997..64019089 100644 --- a/lua/custom/plugins/copilot.lua +++ b/lua/custom/plugins/copilot.lua @@ -4,10 +4,10 @@ -- See the kickstart.nvim README for more information return { -- Github Copilot - 'github/copilot.vim', - config = function() - vim.g.copilot_assume_mapped = true - vim.g.copilot_no_tab_map = true - vim.api.nvim_set_keymap('i', '', 'copilot#Accept("")', { silent = true, expr = true }) - end, + -- 'github/copilot.vim', + -- config = function() + -- vim.g.copilot_assume_mapped = true + -- vim.g.copilot_no_tab_map = true + -- vim.api.nvim_set_keymap('i', '', 'copilot#Accept("")', { silent = true, expr = true }) + -- end, }