diff --git a/init.lua b/init.lua index 560cc1a..ce5e66a 100644 --- a/init.lua +++ b/init.lua @@ -18,6 +18,7 @@ require("lazy").setup({ "karb94/neoscroll.nvim", --Smooth Scrolling -- 'paretje/nvim-man', -- man page syntax highlighting 'fei6409/log-highlight.nvim', -- generic log syntax highlighting + 'mikevskater/nvim-colorpicker', --Color picking tool 'stevearc/conform.nvim', --auto formats certain text 'tpope/vim-commentary', -- commenting lines with shortcut 'vigoux/ltex-ls.nvim', -- grammer checking diff --git a/lazy-lock.json b/lazy-lock.json index 07e6ce5..f595187 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,11 +3,11 @@ "base16-nvim": { "branch": "master", "commit": "23e5128eb5f629c29532c24a1e733cbe019f05bb" }, "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "codecompanion.nvim": { "branch": "main", "commit": "6cbbcb4503430644f04ea5f087c8e2ea4cdc6f6e" }, + "codecompanion.nvim": { "branch": "main", "commit": "7cc35b7f7f08d093469fa9ae67d3af716bd729c3" }, "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" }, "dashboard-nvim": { "branch": "master", "commit": "f787e3462c2ee2b6117b17c1aa4ddf66cb6f57fe" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "fd": { "branch": "master", "commit": "f7d4d717c287a7834f8721efc0fa91c51d92afee" }, + "fd": { "branch": "master", "commit": "25461e5ce13dc12ff2a75993285a87e99b33db2d" }, "fzf-lua": { "branch": "main", "commit": "988416cc782dfe28bff3f0da9b8c943b236cd86a" }, "gemini-cli.nvim": { "branch": "main", "commit": "c9fd62adda823628f5131a939d9c56ef7a898600" }, "gitsigns.nvim": { "branch": "main", "commit": "25050e4ed39e628282831d4cbecb1850454ce915" }, @@ -23,30 +23,31 @@ "log-highlight.nvim": { "branch": "main", "commit": "b2e00cfd41ca94338265a595f3f3f423d9f9322e" }, "ltex-ls.nvim": { "branch": "main", "commit": "968eac261279d88d7f1ed556aa2dbc535a7489fe" }, "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0a695750d747db1e7e70bcf0267ef8951c95fc83" }, - "mason.nvim": { "branch": "main", "commit": "16ba83bfc8a25f52bb545134f5bee082b195c460" }, - "mini.nvim": { "branch": "main", "commit": "cbae4fa396bbf9c802b3d2dc2e9c5362e8fb9468" }, - "mini.pick": { "branch": "main", "commit": "34fdef3b0966974378c4f39e3ddb54ffc628fbe9" }, - "neogit": { "branch": "master", "commit": "99326a1310fb2d616b455d2fd16d01bf00682f06" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21c5b3ebeaa0412e28096bb0701434c51c1fbf76" }, + "mason.nvim": { "branch": "main", "commit": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d" }, + "mini.nvim": { "branch": "main", "commit": "bf8169f3e518be8de3f88073ace37d91f576cb04" }, + "mini.pick": { "branch": "main", "commit": "0b3599e6df730f3ced3359d33c674288de0d186d" }, + "neogit": { "branch": "master", "commit": "5d1b65d6215928e941e1a6a4e76e02fd45ada31f" }, "neoscroll.nvim": { "branch": "master", "commit": "c8d29979cb0cb3a2437a8e0ae683fd82f340d3b8" }, "nui-components.nvim": { "branch": "main", "commit": "1654dd709f13874089eefc80d82e0eb667f7fdfb" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-colorpicker": { "branch": "main", "commit": "88f6aeac944570ebfb97ac67c9fea27a73ea0429" }, "nvim-dap": { "branch": "master", "commit": "531771530d4f82ad2d21e436e3cc052d68d7aebb" }, - "nvim-java": { "branch": "main", "commit": "602a5f7fa92f9c1d425a2159133ff9de86842f0a" }, - "nvim-lspconfig": { "branch": "master", "commit": "229b79051b380377664edc4cbd534930154921a1" }, + "nvim-java": { "branch": "main", "commit": "f36a376dfebbbb4cf382008ea6e8b70d40049112" }, + "nvim-lspconfig": { "branch": "master", "commit": "a683e0ddf0cf64c6cd689e18ffb480ade3c162b7" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-tree.lua": { "branch": "master", "commit": "07f541fcaa4a5ae019598240362449ab7e9812b3" }, + "nvim-tree.lua": { "branch": "master", "commit": "fb343438d49fba8c35ecc4829d66fca7a1f0ed3d" }, "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" }, - "obsidian.nvim": { "branch": "main", "commit": "239af7e896d1857d0a644253d2c7e571d38529a5" }, + "obsidian.nvim": { "branch": "main", "commit": "a0abc4f89d7228ee72091fcb31b46955e7d89a4c" }, "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "remote-nvim.nvim": { "branch": "main", "commit": "9992c2fb8bf4f11aca2c8be8db286b506f92efcb" }, "render-markdown.nvim": { "branch": "main", "commit": "5adf0895310c1904e5abfaad40a2baad7fe44a07" }, "resize.nvim": { "branch": "main", "commit": "0b8943ef2ce54e65b9e56974e94dee593b28e7b5" }, - "ripgrep": { "branch": "master", "commit": "48a6ad93f152dc848f1883ceb3bf2c7baab6738c" }, + "ripgrep": { "branch": "master", "commit": "82313cf95849bfe425109ad9506a52154879b1b1" }, "snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" }, "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" }, "sudo.nvim": { "branch": "main", "commit": "10c211716f0f0149ea91732bc12338ade76d4af8" }, @@ -60,7 +61,7 @@ "vim-signature": { "branch": "master", "commit": "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc" }, "vim-termhere": { "branch": "main", "commit": "b66d429dd48b74802f09fd059bc499c253372a1c" }, "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, - "vimtex": { "branch": "master", "commit": "24e229914182ff301496a3e2c4214b28c4928d3f" }, + "vimtex": { "branch": "master", "commit": "fedb7ffc1bebf254cc74e7419c3a5930b6719065" }, "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/lua/keybinds.lua b/lua/keybinds.lua index f7f271f..2f5ff58 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -9,7 +9,6 @@ vim.cmd('silent! tmapclear') -- Clears Terminal maps -- ========================================== -- Define your current keymaps below this line -- ========================================== -vim.keymap.set('n', 'w', ':w') package.loaded["custom-functions"] = nil local utils = require("custom-functions") @@ -27,8 +26,8 @@ vim.keymap.set('n','' ,'nohlsearch') vim.keymap.set('t','' ,'' ,{ desc = 'Exit terminal mode' }) vim.keymap.set('n','r' ,'TermExec cmd="clear && make"' ,{ desc = '[r]un make in terminal' }) vim.keymap.set('n','l' ,function() utils.RunCommand("l") end ,{ desc = 'run [l]ast command in terminal' }) -vim.keymap.set('n','n' ,'ToggleTerm direction=vertical name=compile size=70', { desc = 'open a [n]ew terminal' }) -vim.keymap.set('n','t' ,'ToggleTerm' ,{desc = '[T]oggle all terminals'}) +vim.keymap.set('n','nn' ,'ToggleTerm direction=vertical name=compile size=70', { desc = 'open a [n]ew terminal' }) +vim.keymap.set('n','nt' ,'ToggleTerm' ,{desc = '[T]oggle all terminals'}) vim.keymap.set("n","e" ,"NvimTreeToggle" ,{desc = 'open [E]xplorer'}) -- Diagnostic keymaps vim.keymap.set('n', 'q' ,vim.diagnostic.setloclist ,{ desc = 'Open diagnostic [Q]uickfix list' }) @@ -81,6 +80,7 @@ vim.keymap.set('n', 'ff' ,'Telescope find_files' ,{ desc = ' vim.keymap.set('n', 'fg' ,'Telescope live_grep' ,{ desc = 'Telescope live grep' }) vim.keymap.set('n', 'fb' ,'Telescope buffers' ,{ desc = 'Telescope buffers' }) vim.keymap.set('n', 'fh' ,'Telescope help_tags' ,{ desc = 'Telescope help tags' }) +vim.keymap.set('n', 't' ,'Telescope' ,{ desc = 'Open [T]elescope' }) diff --git a/lua/plugins/codecompanion.lua b/lua/plugins/codecompanion.lua index b668b61..88067dc 100644 --- a/lua/plugins/codecompanion.lua +++ b/lua/plugins/codecompanion.lua @@ -29,7 +29,7 @@ return { adapter = "gemini_pro", -- Removed the curly braces }, inline = { - adapter = "gemini_flash", -- Removed the curly braces + adapter = "ollama_coder", -- Removed the curly braces }, }, background = { @@ -57,13 +57,24 @@ return { }, }) end, + -- local ollama coding model + ollama_coder = function() + return require("codecompanion.adapters").extend("ollama", { + name = "ollama_bg", + schema = { + model = { + default = "qwen2.5-coder:7b", + }, + }, + }) + end, -- Added an extended Ollama adapter to fix your background task ollama_bg = function() return require("codecompanion.adapters").extend("ollama", { name = "ollama_bg", schema = { model = { - default = "qwen-7b-instruct", + default = "qwen3.5:4b", }, }, })