diff --git a/lua/linterconfiguration.lua b/lua/linterconfiguration.lua index 677dd5e..e78c04f 100644 --- a/lua/linterconfiguration.lua +++ b/lua/linterconfiguration.lua @@ -24,6 +24,7 @@ local fixers = { python = { "yapf" }, pascal = { "ptop" }, haskell = { "fourmolu" }, + rust = { "rustfmt" }, } vim.g.ale_linters = linters diff --git a/lua/lspconfiguration.lua b/lua/lspconfiguration.lua index 01ba3d8..f1d5001 100644 --- a/lua/lspconfiguration.lua +++ b/lua/lspconfiguration.lua @@ -15,41 +15,14 @@ require("mason-lspconfig").setup({ }, }) --- require("mason-lspconfig").setup_handlers({ --- function(asm_lsp) --- require("lspconfig")[asm_lsp].setup({}) --- end, --- function(clangd) --- require("lspconfig")[clangd].setup({}) --- end, --- function(lua_ls) --- require("lspconfig")[lua_ls].setup({}) --- end, --- function(hls) --- require("lspconfig")[hls].setup({}) --- end, --- function(rust_analyzer) --- require("lspconfig")[rust_analyzer].setup({}) --- end, --- function(vhdl_ls) --- require("lspconfig")[vhdl_ls].setup({}) --- end, --- function(verible) --- require("lspconfig")[verible].setup({}) --- end, --- function(vimls) --- require("lspconfig")[vimls].setup({}) --- end, --- function(texlab) --- require("lspconfig")[texlab].setup({}) --- end, --- function(als) --- require("lspconfig")[als].setup({}) --- end, --- }) +vim.lsp.enable("verible") +vim.lsp.config("verible", { cmd = { "verible-verilog-ls", "--rules_config_search" } }) -require("lspconfig").verible.setup({ - cmd = { "verible-verilog-ls", "--rules_config_search" }, +vim.lsp.enable("clangd") +vim.lsp.config("clangd", { + cmd = { "clangd" }, + root_markers = { ".clangd" }, + filetypes = { "c", "cpp" }, }) -- @name file_exists @@ -81,10 +54,5 @@ local function get_config_file() end end -require("lspconfig").als.setup({ - settings = { - ada = { - projectFile = get_config_file(), - }, - }, -}) +vim.lsp.enable("als") +vim.lsp.config("als", { projectFile = get_config_file() }) diff --git a/lua/vanilla.lua b/lua/vanilla.lua index 7c4c1db..3f87b6f 100644 --- a/lua/vanilla.lua +++ b/lua/vanilla.lua @@ -103,3 +103,10 @@ vim.api.nvim_create_autocmd({ "BufLeave" }, { pattern = { "*.nix" }, callback = close_nix_interpreter, }) + +vim.filetype.add({ + extension = { + bf = "brainfuck", + }, +}) +