diff --git a/nvim/init.lua b/nvim/init.lua index 083823b..0fb5e1a 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -8,6 +8,7 @@ npx @johnnymorganz/stylua-bin ./init.lua ├─ cfg_leader: Leader keys ├─ cfg_options: See `:help vim.o` ├─ cfg_filetypes: Filetype aliases +├─ cfg_cmds: Commands ├─ cfg_autocmds: Autocomands ├─ cfg_keymaps: General keymaps └─ cfg_lazy: Plugin manager @@ -30,11 +31,9 @@ npx @johnnymorganz/stylua-bin ./init.lua   │ └─ cfg_lazy_lsp_keymaps   ├─ cfg_lazy_cmp: Autocompletion   │ └─ cfg_lazy_cmp_keymaps -   ├─ cfg_lazy_treesitter: Highlight, edit, and navigate code -   │ ├─ cfg_lazy_treesitter_langs -   │ └─ cfg_lazy_treesitter_keymaps -   └─ cfg_lazy_ollama: LLM integration -   └─ cfg_lazy_ollama_prompts +   └─ cfg_lazy_treesitter: Highlight, edit, and navigate code +   ├─ cfg_lazy_treesitter_langs +   └─ cfg_lazy_treesitter_keymaps ]] --[[ cfg_leader: Leader keys ]] @@ -108,6 +107,11 @@ vim.filetype.add { }, } +--[[ cfg_cmds: Commands ]] + +-- Ignore :EditQuery command +vim.cmd 'command E Explore' + --[[ cfg_autocmds: Autocomands ]] -- Highlight on yank @@ -247,8 +251,8 @@ require('lazy').setup({ }, --[[ cfg_lazy_desolate: Not-so-colorful colorscheme ]] { - -- dir = '~/trash/desolate.nvim', 'He4eT/desolate.nvim', + -- dir = '~/trash/desolate.nvim', priority = 1000, init = function() vim.g.desolate_h = 0 @@ -650,52 +654,6 @@ require('lazy').setup({ } end, }, - --[[ cfg_lazy_ollama: LLM integration ]] - { - 'nomnivore/ollama.nvim', - dependencies = { - 'nvim-lua/plenary.nvim', - }, - cmd = { 'Ollama', 'OllamaModel' }, - keys = { - { - 'j', - ':Ollama', - desc = 'Ollama Menu', - mode = { 'v' }, - }, - { - 'j', - ":lua require('ollama').prompt('Generate_Code')", - desc = 'Ollama Code Generation', - mode = { 'n' }, - }, - }, - opts = { - model = 'mistral', - url = 'http://ollama.internal:11434', -- see /etc/hosts - --[[ cfg_lazy_ollama_prompts ]] - prompts = { - Ask_About_Code = false, - Simplify_Code = false, - Improve_Text = { - prompt = 'Make this text simple and readable. Respond with improved version of this text: ```$sel```', - extract = false, - action = 'replace', - }, - Modify_Text = { - prompt = 'Modify this text in the following way: $input\n\n' .. '```$sel```', - extract = false, - action = 'replace', - }, - Use_selection_as_prompt = { - prompt = '$sel', - extract = false, - action = 'replace', - }, - }, - }, - }, }, { -- lazy.nvim options lockfile = '~/dotfiles/nvim/lazy-lock.json', diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 9d960ca..d7352ab 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -4,7 +4,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "desolate.nvim": { "branch": "develop", "commit": "460602427d4a7a35364790e520cf032e5d78cb60" }, + "desolate.nvim": { "branch": "develop", "commit": "ba2c186626b906af83bf7bfb4992ccfc32b3ea11" }, "fzf": { "branch": "master", "commit": "7c2ffd3fef3f9131ee448a5f40d91835c8bd814d" }, "fzf-lua": { "branch": "main", "commit": "1ec6eeda11c3a3dcd544e1c61ad4b8c9b49903c4" }, "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, @@ -19,9 +19,7 @@ "nvim-lspconfig": { "branch": "master", "commit": "9baca6a403b3b2098224010fda6ff5615ae6e782" }, "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "ollama.nvim": { "branch": "main", "commit": "45e58779fecde7ac5b8f62800bbe7180d4b48507" }, "onedark.nvim": { "branch": "master", "commit": "8e4b79b0e6495ddf29552178eceba1e147e6cecf" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }