From c4f7c96bf000031c4343153f3e8e6468807fdae4 Mon Sep 17 00:00:00 2001 From: oddlama Date: Fri, 20 Jan 2023 22:50:11 +0100 Subject: [PATCH] chore: remove mason from neovim --- users/common/neovim/default.nix | 4 ++++ users/common/neovim/init.lua | 13 +++++-------- users/common/neovim/lua/options.lua | 1 - users/common/neovim/lua/plugins/others.lua | 11 +---------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/users/common/neovim/default.nix b/users/common/neovim/default.nix index 7022ec1..1bb682a 100644 --- a/users/common/neovim/default.nix +++ b/users/common/neovim/default.nix @@ -9,9 +9,13 @@ viAlias = true; vimAlias = true; vimdiffAlias = true; + withPython3 = true; + extraPython3Packages = pyPkgs: with pyPkgs; [openai]; + withNodeJs = true; defaultEditor = true; }; }; xdg.configFile."nvim/lua".source = ./lua; xdg.configFile."nvim/init.lua".source = ./init.lua; + home.packages = with pkgs; [gcc shellcheck stylua]; } diff --git a/users/common/neovim/init.lua b/users/common/neovim/init.lua index 51d73e2..3ac3e8d 100644 --- a/users/common/neovim/init.lua +++ b/users/common/neovim/init.lua @@ -75,7 +75,7 @@ return packer.startup(function(use) -- Rust specific tools use { "simrat39/rust-tools.nvim", before = "nvim-lspconfig" } -- Language server configurations - use { "neovim/nvim-lspconfig", config = conf_module "lspconfig", after = "mason-lspconfig.nvim" } + use { "neovim/nvim-lspconfig", config = conf_module "lspconfig" } -- Neovim as an additional language server use { "jose-elias-alvarez/null-ls.nvim", config = conf_fn "null-ls" } @@ -108,9 +108,6 @@ return packer.startup(function(use) -- Startup screen use { "goolord/alpha-nvim", config = conf_module "alpha" } - -- Language server / DAP installer - use { "williamboman/mason.nvim", config = conf_setup "mason" } - use { "williamboman/mason-lspconfig.nvim", config = conf_setup "mason-lspconfig", after = "mason.nvim" } -- Window Picker use { "s1n7ax/nvim-window-picker", tag = "v1.*", config = conf_setup "window-picker" } -- Filebrowser @@ -137,12 +134,12 @@ return packer.startup(function(use) -- Completion ---------------------------------------------------------------------------------------------------- - -- Completion engine - use { "hrsh7th/nvim-cmp", config = conf_module "cmp" } -- Snippet engine - use { "L3MON4D3/LuaSnip", after = "nvim-cmp" } + use { "L3MON4D3/LuaSnip" } + -- Completion engine + use { "hrsh7th/nvim-cmp", config = conf_module "cmp", after = "LuaSnip" } -- Luasnip completion source - use { "saadparwaiz1/cmp_luasnip", after = "LuaSnip" } + use { "saadparwaiz1/cmp_luasnip", after = "nvim-cmp" } -- Internal LSP completion source use { "hrsh7th/cmp-nvim-lsp", after = "cmp_luasnip" } -- Buffer words completion source diff --git a/users/common/neovim/lua/options.lua b/users/common/neovim/lua/options.lua index fe462da..9924bd4 100644 --- a/users/common/neovim/lua/options.lua +++ b/users/common/neovim/lua/options.lua @@ -1,7 +1,6 @@ local opt = vim.opt local g = vim.g -g.python3_host_prog = vim.fn.stdpath "data" .. "/venv/bin/python3" g.mapleader = "," ---------------------------------------------------------------------------------------------------- diff --git a/users/common/neovim/lua/plugins/others.lua b/users/common/neovim/lua/plugins/others.lua index 32c14dc..b4b42d9 100644 --- a/users/common/neovim/lua/plugins/others.lua +++ b/users/common/neovim/lua/plugins/others.lua @@ -15,7 +15,7 @@ local configs = { sources = { null_ls.builtins.code_actions.shellcheck, null_ls.builtins.formatting.stylua, - null_ls.builtins.diagnostics.eslint, + --null_ls.builtins.diagnostics.eslint, null_ls.builtins.completion.spell, }, } @@ -78,15 +78,6 @@ local configs = { }, other_win_hl_color = "#4493c8", }, - ["mason"] = { - ui = { - icons = { - package_pending = " ", - package_installed = " ", - package_uninstalled = " ﮊ", - }, - }, - }, ["gomove"] = { map_defaults = false, undojoin = true,