diff --git a/lua/keymap.lua b/lua/keymap.lua
index 68356f8..49dacae 100644
--- a/lua/keymap.lua
+++ b/lua/keymap.lua
@@ -124,8 +124,8 @@ vim.api.nvim_create_autocmd('BufEnter', {
 })
 
 -- AI mappings
-vim.keymap.set('v', '<Leader>ae', '<CMD>CodeCompanion<CR>', { desc = 'Edit selection with AI' })
-vim.keymap.set('n', '<Leader>ac', '<CMD>CodeCompanionCmd<CR>', { desc = 'Run Neovim commands with AI' })
+-- vim.keymap.set('v', '<Leader>ae', '<CMD>CodeCompanion<CR>', { desc = 'Edit selection with AI' })
+-- vim.keymap.set('n', '<Leader>ac', '<CMD>CodeCompanionCmd<CR>', { desc = 'Run Neovim commands with AI' })
 vim.api.nvim_create_autocmd('FileType', {
     pattern = 'codecompanion',
     callback = function()
diff --git a/lua/plugins/aider.lua b/lua/plugins/aider.lua
new file mode 100644
index 0000000..2c6ff4b
--- /dev/null
+++ b/lua/plugins/aider.lua
@@ -0,0 +1,54 @@
+return {
+    'GeorgesAlkhouri/nvim-aider',
+    cmd = 'Aider',
+    keys = {
+        { '<leader>a/', '<cmd>Aider toggle<cr>', desc = 'Toggle Aider' },
+        { '<leader>as', '<cmd>Aider send<cr>', desc = 'Send to Aider', mode = { 'n', 'v' } },
+        { '<leader>ac', '<cmd>Aider command<cr>', desc = 'Aider Commands' },
+        { '<leader>ab', '<cmd>Aider buffer<cr>', desc = 'Send Buffer' },
+        { '<leader>a+', '<cmd>Aider add<cr>', desc = 'Add File' },
+        { '<leader>a-', '<cmd>Aider drop<cr>', desc = 'Drop File' },
+        { '<leader>ar', '<cmd>Aider add readonly<cr>', desc = 'Add Read-Only' },
+        { '<leader>aR', '<cmd>Aider reset<cr>', desc = 'Reset Session' },
+        -- Example nvim-tree.lua integration if needed
+        { '<leader>a+', '<cmd>AiderTreeAddFile<cr>', desc = 'Add File from Tree to Aider', ft = 'NvimTree' },
+        { '<leader>a-', '<cmd>AiderTreeDropFile<cr>', desc = 'Drop File from Tree from Aider', ft = 'NvimTree' },
+    },
+    dependencies = {
+        'folke/snacks.nvim',
+        --- The below dependencies are optional
+        'catppuccin/nvim',
+        'nvim-tree/nvim-tree.lua',
+        --- Neo-tree integration
+        {
+            'nvim-neo-tree/neo-tree.nvim',
+            opts = function(_, opts)
+                -- Example mapping configuration (already set by default)
+                -- opts.window = {
+                --   mappings = {
+                --     ["+"] = { "nvim_aider_add", desc = "add to aider" },
+                --     ["-"] = { "nvim_aider_drop", desc = "drop from aider" }
+                --     ["="] = { "nvim_aider_add_read_only", desc = "add read-only to aider" }
+                --   }
+                -- }
+                require('nvim_aider.neo_tree').setup(opts)
+            end,
+        },
+    },
+    config = function()
+        require('nvim_aider').setup({
+            aider_cmd = 'aider',
+            args = {
+                '--config=$HOME/.config/aider/aider.yaml',
+                '--no-auto-commits',
+                '--copy-paste',
+            },
+            auto_reload = true,
+            win = {
+                wo = { winbar = 'Aider' },
+                style = 'nvim_aider',
+                position = 'bottom',
+            },
+        })
+    end,
+}