diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json index 8d2cbab..78d25d6 100644 --- a/.config/nvim/nvim-pack-lock.json +++ b/.config/nvim/nvim-pack-lock.json @@ -37,6 +37,14 @@ "rev": "221ce6b2d999187044529f49da6554a92f740a96", "src": "https://github.com/nvim-lualine/lualine.nvim" }, + "mason-lspconfig.nvim": { + "rev": "67029ccdac1ef8941e13b826417bc0ffac24cc86", + "src": "https://github.com/mason-org/mason-lspconfig.nvim" + }, + "mason.nvim": { + "rev": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d", + "src": "https://github.com/mason-org/mason.nvim" + }, "mini.ai": { "rev": "25248c6aa002391936a6200f12d1466015987133", "src": "https://github.com/nvim-mini/mini.ai" diff --git a/.config/nvim/plugin/conform.lua b/.config/nvim/plugin/conform.lua index 6bc53e3..7c873a2 100644 --- a/.config/nvim/plugin/conform.lua +++ b/.config/nvim/plugin/conform.lua @@ -32,6 +32,7 @@ vim.api.nvim_create_autocmd("BufReadPost", { typst = { "typstyle" }, yaml = { "yamlfmt" }, fish = { "fish-lsp" }, + dockerfile = { "dockerfmt" }, }, formatters = { diff --git a/.config/nvim/plugin/mason.lua b/.config/nvim/plugin/mason.lua new file mode 100644 index 0000000..7222f35 --- /dev/null +++ b/.config/nvim/plugin/mason.lua @@ -0,0 +1,22 @@ +vim.api.nvim_create_autocmd("VimEnter", { + once = true, + callback = function() + vim.pack.add({ + "https://github.com/mason-org/mason.nvim", + "https://github.com/mason-org/mason-lspconfig.nvim", + }) + + require("mason").setup({ + ui = { + backdrop = 100, + icons = { + package_installed = "", + package_pending = "󰇚", + package_uninstalled = "", + }, + }, + }) + + require("mason-lspconfig").setup() + end, +}) diff --git a/.config/nvim/plugin/nvim-lspconfig.lua b/.config/nvim/plugin/nvim-lspconfig.lua index 303edde..d8acfd5 100644 --- a/.config/nvim/plugin/nvim-lspconfig.lua +++ b/.config/nvim/plugin/nvim-lspconfig.lua @@ -31,29 +31,8 @@ vim.lsp.config("lua_ls", { }, }, }) -vim.lsp.enable("lua_ls") - --- sqruff -vim.lsp.config("sqruff", { - filetypes = { "sql" }, - cmd = { "sqruff", "lsp" }, -}) -vim.lsp.enable("sqruff") - --- biome -vim.lsp.config("biome", { - filetypes = { "css", "json" }, -}) -vim.lsp.enable("biome") -- gleam -vim.lsp.config("gleam", { - filetypes = { "gleam" }, - cmd = { "gleam", "lsp" }, -}) -vim.lsp.enable("gleam") - --- tailwind vim.lsp.config("tailwindcss", { cmd = { "tailwindcss-language-server" }, filetypes = { "gleam" }, @@ -73,46 +52,7 @@ vim.lsp.config("tailwindcss", { }, }) vim.lsp.enable("tailwindcss") - --- fish -vim.lsp.config("fish-lsp", { - filetypes = { "fish" }, - cmd = { "fish-lsp", "start" }, -}) -vim.lsp.enable("fish-lsp") - --- zig -vim.lsp.config("zls", { - filetypes = { "zig" }, - cmd = { "zls" }, - root_markers = { { "build.zig", "build.zig.zon" }, ".git" }, -}) -vim.lsp.enable("zls") - --- odin -vim.lsp.config("ols", { - settings = { - init_options = { - checker_args = "-strict-style", - collections = { - { name = "shared", path = vim.fn.expand("$HOME/odin-lib") }, - }, - }, - }, -}) -vim.lsp.enable("ols") - --- markdown -vim.lsp.config("rumdl", { - filetypes = { "markdown" }, -}) -vim.lsp.enable("rumdl") - -vim.lsp.config("marksman", { - filetypes = { "markdown", "djot" }, - root_markers = { ".marksman.toml", ".git" }, -}) -vim.lsp.enable("marksman") +vim.lsp.enable("gleam") -- godot vim.lsp.config("gdscript", { @@ -122,18 +62,6 @@ vim.lsp.config("gdscript", { }) vim.lsp.enable("gdscript") --- typst -vim.lsp.config("tinymist", { - filetypes = { "typst" }, -}) -vim.lsp.enable("tinymist") - --- erlang -vim.lsp.config("elp", { - filetypes = { "erlang" }, -}) -vim.lsp.enable("elp") - -- rust/oyui config file vim.lsp.config("oyui_ls", { cmd = { "oyui", "language-server" }, diff --git a/packages.txt b/packages.txt index 286e697..fd5b324 100644 --- a/packages.txt +++ b/packages.txt @@ -7,8 +7,6 @@ deno difftastic direnv elio -elp -erlfmt-git fastfetch fd fish @@ -22,7 +20,6 @@ just keychain localsend lua -lua-language-server luarocks make marksman @@ -37,7 +34,6 @@ ripgrep ripgrep-all rumdl sqruff -stylua tailwind-language-server taplo tinymist @@ -45,7 +41,6 @@ trash-cli tree-sitter tree-sitter-cli typst -typstyle vesktop vicinae-bin watchexec