diff --git a/init.lua b/init.lua index 9e65493..bf72b5a 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,7 @@ require("vim-options") local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then +if not (vim.uv or vim.loop).fs_stat(lazypath) then vim.fn.system({ "git", "clone", diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 0af4ee2..edf62c5 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -10,6 +10,6 @@ return { theme = "dragon" }) - vim.cmd("colorscheme kanagawa") + vim.cmd("colorscheme kanagawa-dragon") end } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 037c0ad..6268656 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,6 +1,6 @@ return { { - "williamboman/mason.nvim", + "mason-org/mason.nvim", config = function() require("mason").setup() @@ -8,13 +8,15 @@ return { }, { "williamboman/mason-lspconfig.nvim", - + config = function() - local mason_lspconfig = require("mason") + local mason_lspconfig = require("mason-lspconfig") mason_lspconfig.setup({ - ensure_installed = { "clangd", "texlab", "lua_ls", "matlab_ls", "mesonlsp", "sqlls", "svlangserver", "ts_ls", "volar" } + ensure_installed = { "clangd", "lua_ls", "matlab_ls", "mesonlsp", "texlab", "ts_ls", "volar", "zls" }, + automatic_enable = true }) + end } } diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index bc51a6c..2879b39 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -3,31 +3,22 @@ return { config = function() local lspconfig = require("lspconfig") - local mason_registry = require("mason-registry") - local volar_path = mason_registry.get_package("vue-language-server"):get_install_path() .. "/node_modules/@vue/language-server" - lspconfig.clangd.setup({ + vim.lsp.config("clangd", { cmd = { "clangd", "-header-insertion=never" }, }) - lspconfig.lua_ls.setup({}) - lspconfig.matlab_ls.setup({}) - lspconfig.mesonlsp.setup({}) - lspconfig.sqlls.setup({}) - lspconfig.svlangserver.setup({}) - lspconfig.texlab.setup({}) - lspconfig.ts_ls.setup({ + vim.lsp.config("ts_ls", { init_options = { plugins = { { name = "@vue/typescript-plugin", - location = vue_language_server_path, + location = vim.fn.expand("$MASON") .. "/packages/vue-language-server/node_modules/@vue/language-server", languages = { "vue" }, }, }, }, filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" }, }) - lspconfig.volar.setup({}) end } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 7d558f5..b65ec17 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -9,7 +9,7 @@ return { require("telescope").setup({}) local builtin = require("telescope.builtin") - + vim.keymap.set("n", "", builtin.find_files, {}) vim.keymap.set("n", "", builtin.live_grep, {}) end diff --git a/lua/plugins/zig.lua b/lua/plugins/zig.lua new file mode 100644 index 0000000..8e911ee --- /dev/null +++ b/lua/plugins/zig.lua @@ -0,0 +1,3 @@ +return { + "ziglang/zig.vim" +} diff --git a/lua/vim-options.lua b/lua/vim-options.lua index 7d83804..ebc0717 100644 --- a/lua/vim-options.lua +++ b/lua/vim-options.lua @@ -1,4 +1,3 @@ -vim.o.background = "" vim.cmd("set number") vim.cmd("set expandtab") vim.cmd("set tabstop=2")