From 8fb5a9a6d914314cc1a590acf3a95352fcf89f3a Mon Sep 17 00:00:00 2001 From: KaasKop- Date: Mon, 15 Apr 2024 20:09:26 +0200 Subject: [PATCH] Update --- config/nvim/lua/config/lazy.lua | 10 +- config/nvim/lua/config/options.lua | 3 +- config/nvim/lua/plugins/colorizer.lua | 4 + config/nvim/lua/plugins/mason.lua | 19 ++- config/nvim/lua/plugins/neo-tree.lua | 2 - config/nvim/lua/plugins/nvim-lspconfig.lua | 38 ++++++ config/nvim/lua/plugins/nvim-treesitter.lua | 2 + config/nvim/lua/plugins/refactoring.lua | 121 ------------------ .../nvim/lua/plugins/telescope-fzf-native.lua | 13 ++ 9 files changed, 76 insertions(+), 136 deletions(-) create mode 100644 config/nvim/lua/plugins/colorizer.lua create mode 100644 config/nvim/lua/plugins/nvim-lspconfig.lua delete mode 100644 config/nvim/lua/plugins/refactoring.lua create mode 100644 config/nvim/lua/plugins/telescope-fzf-native.lua diff --git a/config/nvim/lua/config/lazy.lua b/config/nvim/lua/config/lazy.lua index ab15ca0..ea9298a 100644 --- a/config/nvim/lua/config/lazy.lua +++ b/config/nvim/lua/config/lazy.lua @@ -10,11 +10,11 @@ vim.opt.rtp:prepend(vim.env.LAZY or lazypath) require("lazy").setup({ spec = { { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.json" }, - { import = "lazyvim.plugins.extras.lang.yaml" }, - { import = "lazyvim.plugins.extras.lang.tailwind" }, - { import = "lazyvim.plugins.extras.lang.markdown" }, + -- { import = "lazyvim.plugins.extras.lang.typescript" }, + -- { import = "lazyvim.plugins.extras.lang.json" }, + -- { import = "lazyvim.plugins.extras.lang.yaml" }, + -- { import = "lazyvim.plugins.extras.lang.tailwind" }, + -- { import = "lazyvim.plugins.extras.lang.markdown" }, { import = "plugins" }, }, defaults = { diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua index 785c746..4531474 100644 --- a/config/nvim/lua/config/options.lua +++ b/config/nvim/lua/config/options.lua @@ -6,4 +6,5 @@ LazyVim.terminal.setup("fish") local opt = vim.opt -opt.mouse = "" +opt.mouse = "a" +opt.termguicolors = true diff --git a/config/nvim/lua/plugins/colorizer.lua b/config/nvim/lua/plugins/colorizer.lua new file mode 100644 index 0000000..fac5bae --- /dev/null +++ b/config/nvim/lua/plugins/colorizer.lua @@ -0,0 +1,4 @@ +return { + "NvChad/nvim-colorizer.lua", + opts = {}, +} diff --git a/config/nvim/lua/plugins/mason.lua b/config/nvim/lua/plugins/mason.lua index 88823fb..7543ec1 100644 --- a/config/nvim/lua/plugins/mason.lua +++ b/config/nvim/lua/plugins/mason.lua @@ -1,11 +1,16 @@ return { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { - "css-lsp", - "biome", + opts = { + ensure_installed = { + "bash-language-server", "vue-language-server", - }) - end, + "dockerfile-language-server", + "typescript-language-server", + "html-lsp", + "marksman", + "csharp-language-server", + "sqls", + "json-lsp" + }, + }, } diff --git a/config/nvim/lua/plugins/neo-tree.lua b/config/nvim/lua/plugins/neo-tree.lua index e425902..d33a9bd 100644 --- a/config/nvim/lua/plugins/neo-tree.lua +++ b/config/nvim/lua/plugins/neo-tree.lua @@ -1,7 +1,5 @@ return { "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - cmd = "Neotree", opts = { sources = { "filesystem", "buffers", "git_status", "document_symbols" }, open_files_do_not_replace_types = { "terminal", "Trouble", "trouble", "qf", "Outline" }, diff --git a/config/nvim/lua/plugins/nvim-lspconfig.lua b/config/nvim/lua/plugins/nvim-lspconfig.lua new file mode 100644 index 0000000..387387a --- /dev/null +++ b/config/nvim/lua/plugins/nvim-lspconfig.lua @@ -0,0 +1,38 @@ +return {} +-- return { +-- "neovim/nvim-lspconfig", +-- opts = { +-- -- LSP Server Settings +-- ---@type lspconfig.options +-- servers = { +-- lua_ls = { +-- -- Use this to add any additional keymaps +-- -- for specific lsp servers +-- ---@type LazyKeysSpec[] +-- -- keys = {}, +-- settings = { +-- Lua = { +-- workspace = { +-- checkThirdParty = false, +-- }, +-- codeLens = { +-- enable = true, +-- }, +-- completion = { +-- callSnippet = "Replace", +-- }, +-- }, +-- }, +-- }, +-- -- tsserver = {}, +-- biome = {}, +-- volar = { +-- settings = {}, +-- }, +-- pyright = {}, +-- }, +-- -- return true if you don't want this server to be setup with lspconfig +-- ---@type table +-- setup = {}, +-- }, +-- } diff --git a/config/nvim/lua/plugins/nvim-treesitter.lua b/config/nvim/lua/plugins/nvim-treesitter.lua index 8ef47f8..4f7d367 100644 --- a/config/nvim/lua/plugins/nvim-treesitter.lua +++ b/config/nvim/lua/plugins/nvim-treesitter.lua @@ -25,6 +25,8 @@ return { "csv", "css", "scss", + "dockerfile", + "c_sharp", }, }, } diff --git a/config/nvim/lua/plugins/refactoring.lua b/config/nvim/lua/plugins/refactoring.lua deleted file mode 100644 index 059475e..0000000 --- a/config/nvim/lua/plugins/refactoring.lua +++ /dev/null @@ -1,121 +0,0 @@ -return { - { - "ThePrimeagen/refactoring.nvim", - event = "BufRead", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - }, - keys = { - { - "rs", - function() - require("telescope").extensions.refactoring.refactors() - end, - mode = "v", - desc = "Refactor", - }, - { - "ri", - function() - require("refactoring").refactor("Inline Variable") - end, - mode = { "n", "v" }, - desc = "Inline Variable", - }, - { - "rb", - function() - require("refactoring").refactor("Extract Block") - end, - desc = "Extract Block", - }, - { - "rf", - function() - require("refactoring").refactor("Extract Block To File") - end, - desc = "Extract Block To File", - }, - { - "rP", - function() - require("refactoring").debug.printf({ below = false }) - end, - desc = "Debug Print", - }, - { - "rp", - function() - require("refactoring").debug.print_var({ normal = true }) - end, - desc = "Debug Print Variable", - }, - { - "rc", - function() - require("refactoring").debug.cleanup({}) - end, - desc = "Debug Cleanup", - }, - { - "rf", - function() - require("refactoring").refactor("Extract Function") - end, - mode = "v", - desc = "Extract Function", - }, - { - "rF", - function() - require("refactoring").refactor("Extract Function To File") - end, - mode = "v", - desc = "Extract Function To File", - }, - { - "rx", - function() - require("refactoring").refactor("Extract Variable") - end, - mode = "v", - desc = "Extract Variable", - }, - { - "rp", - function() - require("refactoring").debug.print_var() - end, - mode = "v", - desc = "Debug Print Variable", - }, - }, - -- opts = { - -- prompt_func_return_type = { - -- go = false, - -- java = false, - -- cpp = false, - -- c = false, - -- h = false, - -- hpp = false, - -- cxx = false, - -- }, - -- prompt_func_param_type = { - -- go = false, - -- java = false, - -- cpp = false, - -- c = false, - -- h = false, - -- hpp = false, - -- cxx = false, - -- }, - -- printf_statements = {}, - -- print_var_statements = {}, - -- }, - config = function(_, options) - require("refactoring").setup(options) - require("telescope").load_extension("refactoring") - end, - }, -} diff --git a/config/nvim/lua/plugins/telescope-fzf-native.lua b/config/nvim/lua/plugins/telescope-fzf-native.lua new file mode 100644 index 0000000..1233af5 --- /dev/null +++ b/config/nvim/lua/plugins/telescope-fzf-native.lua @@ -0,0 +1,13 @@ +return { + "telescope.nvim", + dependencies = { + "nvim-telescope/telescope-fzf-native.nvim", + build = "make", + config = function() + require("telescope").load_extension("fzf") + end, + cond = function() + return vim.fn.executable("make") == 1 + end, + }, +}