forked from mirrors_public/oddlama_nix-config
chore: remove mason from neovim
This commit is contained in:
parent
ff7a599b31
commit
c4f7c96bf0
4 changed files with 10 additions and 19 deletions
|
@ -9,9 +9,13 @@
|
||||||
viAlias = true;
|
viAlias = true;
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
vimdiffAlias = true;
|
vimdiffAlias = true;
|
||||||
|
withPython3 = true;
|
||||||
|
extraPython3Packages = pyPkgs: with pyPkgs; [openai];
|
||||||
|
withNodeJs = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
xdg.configFile."nvim/lua".source = ./lua;
|
xdg.configFile."nvim/lua".source = ./lua;
|
||||||
xdg.configFile."nvim/init.lua".source = ./init.lua;
|
xdg.configFile."nvim/init.lua".source = ./init.lua;
|
||||||
|
home.packages = with pkgs; [gcc shellcheck stylua];
|
||||||
}
|
}
|
||||||
|
|
|
@ -75,7 +75,7 @@ return packer.startup(function(use)
|
||||||
-- Rust specific tools
|
-- Rust specific tools
|
||||||
use { "simrat39/rust-tools.nvim", before = "nvim-lspconfig" }
|
use { "simrat39/rust-tools.nvim", before = "nvim-lspconfig" }
|
||||||
-- Language server configurations
|
-- 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
|
-- Neovim as an additional language server
|
||||||
use { "jose-elias-alvarez/null-ls.nvim", config = conf_fn "null-ls" }
|
use { "jose-elias-alvarez/null-ls.nvim", config = conf_fn "null-ls" }
|
||||||
|
|
||||||
|
@ -108,9 +108,6 @@ return packer.startup(function(use)
|
||||||
|
|
||||||
-- Startup screen
|
-- Startup screen
|
||||||
use { "goolord/alpha-nvim", config = conf_module "alpha" }
|
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
|
-- Window Picker
|
||||||
use { "s1n7ax/nvim-window-picker", tag = "v1.*", config = conf_setup "window-picker" }
|
use { "s1n7ax/nvim-window-picker", tag = "v1.*", config = conf_setup "window-picker" }
|
||||||
-- Filebrowser
|
-- Filebrowser
|
||||||
|
@ -137,12 +134,12 @@ return packer.startup(function(use)
|
||||||
-- Completion
|
-- Completion
|
||||||
----------------------------------------------------------------------------------------------------
|
----------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
-- Completion engine
|
|
||||||
use { "hrsh7th/nvim-cmp", config = conf_module "cmp" }
|
|
||||||
-- Snippet engine
|
-- 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
|
-- Luasnip completion source
|
||||||
use { "saadparwaiz1/cmp_luasnip", after = "LuaSnip" }
|
use { "saadparwaiz1/cmp_luasnip", after = "nvim-cmp" }
|
||||||
-- Internal LSP completion source
|
-- Internal LSP completion source
|
||||||
use { "hrsh7th/cmp-nvim-lsp", after = "cmp_luasnip" }
|
use { "hrsh7th/cmp-nvim-lsp", after = "cmp_luasnip" }
|
||||||
-- Buffer words completion source
|
-- Buffer words completion source
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
local opt = vim.opt
|
local opt = vim.opt
|
||||||
local g = vim.g
|
local g = vim.g
|
||||||
|
|
||||||
g.python3_host_prog = vim.fn.stdpath "data" .. "/venv/bin/python3"
|
|
||||||
g.mapleader = ","
|
g.mapleader = ","
|
||||||
|
|
||||||
----------------------------------------------------------------------------------------------------
|
----------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -15,7 +15,7 @@ local configs = {
|
||||||
sources = {
|
sources = {
|
||||||
null_ls.builtins.code_actions.shellcheck,
|
null_ls.builtins.code_actions.shellcheck,
|
||||||
null_ls.builtins.formatting.stylua,
|
null_ls.builtins.formatting.stylua,
|
||||||
null_ls.builtins.diagnostics.eslint,
|
--null_ls.builtins.diagnostics.eslint,
|
||||||
null_ls.builtins.completion.spell,
|
null_ls.builtins.completion.spell,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -78,15 +78,6 @@ local configs = {
|
||||||
},
|
},
|
||||||
other_win_hl_color = "#4493c8",
|
other_win_hl_color = "#4493c8",
|
||||||
},
|
},
|
||||||
["mason"] = {
|
|
||||||
ui = {
|
|
||||||
icons = {
|
|
||||||
package_pending = " ",
|
|
||||||
package_installed = " ",
|
|
||||||
package_uninstalled = " ﮊ",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
["gomove"] = {
|
["gomove"] = {
|
||||||
map_defaults = false,
|
map_defaults = false,
|
||||||
undojoin = true,
|
undojoin = true,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue