diff --git a/lua/core/options.lua b/lua/core/options.lua index 69c10e6..47a94a7 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -168,6 +168,7 @@ for _, plugin in pairs(default_plugins) do g["loaded_" .. plugin] = 1 end +-- disable some default providers local default_providers = { "node", "perl", diff --git a/lua/custom/plugins/configs/navigator.lua b/lua/custom/plugins/configs/navigator.lua index 545c4cc..533d3c7 100644 --- a/lua/custom/plugins/configs/navigator.lua +++ b/lua/custom/plugins/configs/navigator.lua @@ -231,7 +231,7 @@ local config = { } } }, - sumneko_lua = { + lua_ls = { before_init=require("neodev.lsp").before_init, } diff --git a/lua/custom/plugins/configs/null-ls.lua b/lua/custom/plugins/configs/null-ls.lua index ff43a91..dbd4f43 100644 --- a/lua/custom/plugins/configs/null-ls.lua +++ b/lua/custom/plugins/configs/null-ls.lua @@ -15,6 +15,10 @@ M.default_sources = { null_ls.builtins.diagnostics.fish, null_ls.builtins.formatting.fish_indent, null_ls.builtins.diagnostics.hadolint, + null_ls.builtins.formatting.autoflake, + null_ls.builtins.formatting.autopep8, + null_ls.builtins.formatting.black, + null_ls.builtins.formatting.isort, } M.extra_sources = { @@ -24,10 +28,6 @@ M.extra_sources = { -- null_ls.builtins.diagnostics.pylint, - null_ls.builtins.formatting.autoflake, - null_ls.builtins.formatting.autopep8, - null_ls.builtins.formatting.black, - null_ls.builtins.formatting.isort, -- golang revive (manually enabled with shortcut from mappings) -- null_ls.builtins.diagnostics.revive, } diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 991375f..e34d5be 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -572,7 +572,7 @@ return { -- ------------------ ["neovim/nvim-lspconfig"] = { -- {{{ - lock = true, + -- lock = true, after = {"mason.nvim", "mason-lspconfig.nvim", "neodev.nvim" }, module = { "lspconfig" }, config = function() @@ -580,7 +580,7 @@ return { end }, ["williamboman/mason-lspconfig.nvim"] = { - lock = true, + -- lock = true, requires = { "williamboman/mason.nvim", "nvim-lspconfig" }, -- after = "mason.nvim", module = { "mson-lspconfig.nvim", "mason.nvim" }, @@ -589,7 +589,7 @@ return { end, }, ["ray-x/guihua.lua"] = { - lock = true, + -- lock = true, module = { "navigator" }, module_pattern = {"guihua*"}, run = "cd lua/fzy && make", @@ -605,7 +605,7 @@ return { -- ["https://git.sp4ke.xyz/sp4ke/navigator.lua"] = -- ["ray-x/navigator.lua"] = { - lock = true, + -- lock = true, opt = true, module = "navigator", after = { "nvim-lspconfig", "base46", "ui", "mason.nvim", "mason-lspconfig.nvim", "neodev.nvim", "null-ls.nvim"}, diff --git a/mysnippets/python.lua b/mysnippets/python.lua index 6db5b4f..979a733 100644 --- a/mysnippets/python.lua +++ b/mysnippets/python.lua @@ -22,5 +22,6 @@ return { })) }, { --autosnippets -- s("uuid#", f(gen_uuid)) - s("ret ", t("return ")) + s("ret ", t("return ")), + s("#ign", t" # type: ignore") } diff --git a/mysnippets/rust.lua b/mysnippets/rust.lua new file mode 100644 index 0000000..15f00df --- /dev/null +++ b/mysnippets/rust.lua @@ -0,0 +1,11 @@ +---@diagnostic disable: undefined-global +-- + +return { + + +}, { --autosnippets + s("v<", fmt("Vec<{}>",{i(0)})) +} + +-- diff --git a/plugin/globals.vim b/plugin/globals.vim index a0503ea..2b04056 100644 --- a/plugin/globals.vim +++ b/plugin/globals.vim @@ -9,3 +9,5 @@ let g:bookmark_no_default_key_mappings = 1 let g:bookmark_highlight_lines = 0 let g:bookmark_auto_save = 1 let g:bookmark_auto_save_file = stdpath('data') . '/bookmarks' + +let g:python3_host_prog = '/home/spike/.pyenv/shims/python'