diff options
Diffstat (limited to 'users')
6 files changed, 3 insertions, 99 deletions
diff --git a/users/seth/programs/neovim/config/init.lua b/users/seth/programs/neovim/config/init.lua index e9820fc..66f7a4b 100644 --- a/users/seth/programs/neovim/config/init.lua +++ b/users/seth/programs/neovim/config/init.lua @@ -5,8 +5,7 @@ local cmd = vim.cmd local opt = vim.opt -vim.g.use_lsp_plugins = true -vim.g.use_mason = false +vim.g.use_lsp_plugins = false; require("getchoo") diff --git a/users/seth/programs/neovim/config/lua/getchoo/lsp/config/init.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/init.lua index b3e58dd..f2634d5 100644 --- a/users/seth/programs/neovim/config/lua/getchoo/lsp/config/init.lua +++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/init.lua @@ -4,7 +4,6 @@ local cmp = require("getchoo.lsp.config.cmp") local lsp_config = require("getchoo.lsp.config.lsp_config") -local mason = require("getchoo.lsp.config.mason") local null_ls = require("getchoo.lsp.config.null_ls") local M = {} @@ -13,13 +12,10 @@ M.cmp = cmp.config M.lsp_servers = lsp_config.servers -M.mason_tool_installer = mason.mason_tool_installer -M.mason_lspconfig = mason.mason_lspconfig - M.null_ls = null_ls.config M.treesitter = { - auto_install = true, + auto_install = false, highlight = { enable = true, additional_vim_regex_highlighting = false, diff --git a/users/seth/programs/neovim/config/lua/getchoo/lsp/config/mason.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/mason.lua deleted file mode 100644 index 24adffb..0000000 --- a/users/seth/programs/neovim/config/lua/getchoo/lsp/config/mason.lua +++ /dev/null @@ -1,17 +0,0 @@ --- --- config for mason tools --- - -local sources = require("getchoo.lsp.config.sources") - -local M = {} - -M.mason_tool_installer = { - ensure_installed = sources.mason, -} - -M.mason_lspconfig = { - automatic_installation = true, -} - -return M diff --git a/users/seth/programs/neovim/config/lua/getchoo/lsp/config/sources.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/sources.lua index 318f67c..bed6361 100644 --- a/users/seth/programs/neovim/config/lua/getchoo/lsp/config/sources.lua +++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/config/sources.lua @@ -20,15 +20,7 @@ local M = { formatting.rustfmt, formatting.stylua, formatting.yapf, - }, - mason = { - "alex", - "codespell", - "prettier", - "pylint", - "stylua", - "yapf", - }, + } } return M diff --git a/users/seth/programs/neovim/config/lua/getchoo/lsp/server.lua b/users/seth/programs/neovim/config/lua/getchoo/lsp/server.lua index 325e1c7..f238eb5 100644 --- a/users/seth/programs/neovim/config/lua/getchoo/lsp/server.lua +++ b/users/seth/programs/neovim/config/lua/getchoo/lsp/server.lua @@ -7,13 +7,6 @@ local lspconfig = require("lspconfig") local null_ls = require("null-ls") local config = require("getchoo.lsp.config") -if vim.g.use_mason then - require("mason").setup() - require("mason-lspconfig").setup(config.mason_lspconfig) - require("mason-tool-installer").setup(config.mason_tool_installer) - vim.opt.runtimepath:append("~/.local/share/nvim/mason/bin/") -end - null_ls.setup(config.null_ls) cmp.setup(config.cmp) diff --git a/users/seth/programs/neovim/config/lua/getchoo/plugins.lua b/users/seth/programs/neovim/config/lua/getchoo/plugins.lua index d3f1863..385710f 100644 --- a/users/seth/programs/neovim/config/lua/getchoo/plugins.lua +++ b/users/seth/programs/neovim/config/lua/getchoo/plugins.lua @@ -23,8 +23,6 @@ require("packer").startup(function(use) use("wbthomason/packer.nvim") -- comsetic plugins - use({ "nvim-lualine/lualine.nvim", requires = { "kyazdani42/nvim-web-devicons" } }) - use({ "catppuccin/nvim", as = "catppuccin", @@ -35,7 +33,6 @@ require("packer").startup(function(use) barbar = true, gitsigns = true, lightspeed = true, - mason = true, cmp = true, nvimtree = true, treesitter_context = true, @@ -49,62 +46,6 @@ require("packer").startup(function(use) end, }) - ---- use("shaunsingh/nord.nvim") - ---- use({ "rose-pine/neovim", as = "rose-pine" }) - - -- general use plugins - use({ - "romgrk/barbar.nvim", - requires = { "kyazdani42/nvim-web-devicons" }, - }) - - use("ggandor/lightspeed.nvim") - use("kyazdani42/nvim-tree.lua") - - -- lsp plugins - if vim.g.use_lsp_plugins then - use("neovim/nvim-lspconfig") - - use({ - "jose-elias-alvarez/null-ls.nvim", - requires = { "nvim-lua/plenary.nvim" }, - }) - - if vim.g.use_mason then - use("williamboman/mason.nvim") - use("williamboman/mason-lspconfig") - use("whoissethdaniel/mason-tool-installer.nvim") - end - - use({ - "nvim-treesitter/nvim-treesitter", - run = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - }) - - use("hrsh7th/nvim-cmp") - use("hrsh7th/cmp-nvim-lsp") - use("hrsh7th/cmp-buffer") - use("hrsh7th/cmp-path") - use("hrsh7th/cmp-vsnip") - use("hrsh7th/vim-vsnip") - use("L3MON4D3/LuaSnip") - use("saadparwaiz1/cmp_luasnip") - - use({ - "folke/trouble.nvim", - requires = { "kyazdani42/nvim-web-devicons" }, - }) - use({ - "nvim-telescope/telescope.nvim", - requires = { "nvim-lua/plenary.nvim" }, - }) - - use("lewis6991/gitsigns.nvim") - use("editorconfig/editorconfig-vim") - end - if Packer_bootstrap then require("packer").sync() end |