diff --git a/nvim/after/plugin/settings.lua b/nvim/after/plugin/settings.lua index 1b99340..f185d6e 100644 --- a/nvim/after/plugin/settings.lua +++ b/nvim/after/plugin/settings.lua @@ -10,20 +10,6 @@ lsp_zero.on_attach(function(client, bufnr) vim.diagnostic.config({virtual_text = false}) end) --- Omnisharp - --- Mason -require('mason').setup({}) -require('mason-lspconfig').setup({ - handlers = { - lsp_zero.default_setup, - lua_ls = function() - local lua_opts = lsp_zero.nvim_lua_ls() - require('lspconfig').lua_ls.setup(lua_opts) - end, - } -}) - -- Cmp local cmp = require('cmp') local cmp_select = {behavior = cmp.SelectBehavior.Select} diff --git a/nvim/lua/trianta/lazy.lua b/nvim/lua/trianta/lazy.lua index 321824a..1e0e26c 100644 --- a/nvim/lua/trianta/lazy.lua +++ b/nvim/lua/trianta/lazy.lua @@ -43,16 +43,12 @@ return require('lazy').setup({ dependencies = { -- LSP Support "neovim/nvim-lspconfig", -- Required - 'williamboman/mason.nvim', -- Optional - 'williamboman/mason-lspconfig.nvim', -- Optional -- Autocompletion 'hrsh7th/nvim-cmp', -- Required 'hrsh7th/cmp-nvim-lsp', -- Required 'hrsh7th/cmp-buffer', -- Optional 'hrsh7th/cmp-path', -- Optional - 'saadparwaiz1/cmp_luasnip', -- Optional - 'hrsh7th/cmp-nvim-lua', -- Optional -- Snippets 'L3MON4D3/LuaSnip', -- Required @@ -70,50 +66,6 @@ return require('lazy').setup({ branch = "harpoon2", dependencies = { "nvim-lua/plenary.nvim" }, }, - -- focus plugins - { - "folke/twilight.nvim", - opts = { - dimming = { - alpha = 0.25, - color = { "Normal", "#ffffff" }, - term_bg = "#000000", - inactive = false, - }, - context = 10, - treesitter = true, - expand = { - "function", - "method", - "table", - "if_statement" - }, - }, - }, - { - "folke/zen-mode.nvim", - opts = { - { - window = { - backdrop = 0.95, - width = 120, - height = 1, - }, - plugins = { - options = { - enabled = true, - ruler = false, - showcmd = false, - }, - twilight = { enabled = true }, - }, - on_open = function(win) - end, - on_close = function() - end, - } - } - }, -- obsidian { "epwalsh/obsidian.nvim", @@ -136,54 +88,4 @@ return require('lazy').setup({ enable = true } }, - -- ollama - { - "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 = { - model = "codellama", - url = "factory.lan:11434", - serve = { - on_start = false, - command = "ollama", - args = { "serve" }, - stop_command = "pkill", - stop_args = { "-SIGTERM", "ollama" }, - }, - -- View the actual default prompts in ./lua/ollama/prompts.lua - prompts = { - Sample_Prompt = { - prompt = "This is a sample prompt that receives $input and $sel(ection), among others.", - input_label = "> ", - model = "mistral", - action = "display", - } - } - } - } })