diff --git a/init.lua b/init.lua index fb2c9de3..ebbfe9ec 100644 --- a/init.lua +++ b/init.lua @@ -239,7 +239,9 @@ require('lazy').setup({ -- "gc" to comment visual regions/lines { 'numToStr/Comment.nvim', opts = {} }, - -- + -- dependency for lots of plugins + 'nvim-tree/nvim-web-devicons', + -- default kickstart plugins require 'kickstart.plugins.gitsigns', require 'kickstart.plugins.which_key', require 'kickstart.plugins.telescope', @@ -247,6 +249,10 @@ require('lazy').setup({ require 'kickstart.plugins.conform', require 'kickstart.plugins.cmp', require 'kickstart.plugins.kanagawa', + -- ollama integration + require 'custom.plugins.ollama', + -- oil, a file explorer + require 'custom.plugins.oil', -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, @@ -352,5 +358,6 @@ vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) vim.keymap.set('n', 'dt', ':DocsViewToggle', { desc = 'Toggle Documentation' }) +vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }) -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua deleted file mode 100644 index 257e3435..00000000 --- a/lua/custom/plugins/init.lua +++ /dev/null @@ -1,23 +0,0 @@ --- You can add your own plugins here or in other files in this directory! --- I promise not to create any merge conflicts in this directory :) --- --- See the kickstart.nvim README for more information -return { - { - 'nvim-tree/nvim-tree.lua', - opts = { - sort = { - sorter = 'case_sensitive', - }, - view = { - width = 30, - }, - renderer = { - group_empty = true, - }, - filters = { - dotfiles = true, - }, - }, - }, -} diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua new file mode 100644 index 00000000..0395d2bd --- /dev/null +++ b/lua/custom/plugins/oil.lua @@ -0,0 +1,7 @@ +return { + 'stevearc/oil.nvim', + opts = {}, + -- Optional dependencies + dependencies = { 'echasnovski/mini.icons' }, + -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if prefer nvim-web-devicons +} diff --git a/lua/custom/plugins/ollama.lua b/lua/custom/plugins/ollama.lua new file mode 100644 index 00000000..472f082d --- /dev/null +++ b/lua/custom/plugins/ollama.lua @@ -0,0 +1,32 @@ +return { + 'nomnivore/ollama.nvim', + dependencies = { + 'nvim-lua/plenary.nvim', + }, + + -- All the user commands added by the plugin + cmd = { 'Ollama', 'OllamaModel', 'OllamaServe', 'OllamaServeStop' }, + + keys = { + -- Sample keybind for prompt menu. Note that the is important for selections to work properly. + { + 'oo', + ":lua require('ollama').prompt()", + desc = 'ollama prompt', + mode = { 'n', 'v' }, + }, + + -- Sample keybind for direct prompting. Note that the is important for selections to work properly. + { + 'oG', + ":lua require('ollama').prompt('Generate_Code')", + desc = 'ollama Generate Code', + mode = { 'n', 'v' }, + }, + }, + + ---@type Ollama.Config + opts = { + -- your configuration overrides + }, +}