diff --git a/config/nvim/nvim.lua b/config/nvim/nvim.lua index 7cb760d..753408d 100644 --- a/config/nvim/nvim.lua +++ b/config/nvim/nvim.lua @@ -1,9 +1,6 @@ -- This will need some refactoring as it is mostly a -- copy and paste from the previous single-file .vim config -require'lspconfig'.rust_analyzer.setup{} -require'lspconfig'.texlab.setup{} -require'lspconfig'.svls.setup{} require'lspconfig'.pylsp.setup{ settings = { formatCommand = {"black"}, @@ -37,7 +34,7 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities() local lspconfig = require('lspconfig') -- Enable some language servers with the additional completion capabilities offered by nvim-cmp -local servers = { 'clangd', 'glsl_analyzer', 'nixd', 'tinymist', 'rust_analyzer', 'vhdl_ls', 'vtsls' } +local servers = { 'clangd', 'glsl_analyzer', 'nixd', 'rust_analyzer', 'texlab', 'tinymist', 'verible', 'vhdl_ls', 'vtsls' } for _, lsp in ipairs(servers) do lspconfig[lsp].setup { -- on_attach = my_custom_on_attach, @@ -118,7 +115,9 @@ require("conform").setup({ html = { "prettier", }, javascript = { "prettier", }, python = { "black" }, - typst = { "prettypst" } + typst = { "prettypst" }, + verilog = { "verible", "trim_whitespace" }, + systemverilog = { "verible", "trim_whitespace" } }, formatters = { prettypst = { diff --git a/packages/default.nix b/packages/default.nix index e2cd363..da54ddc 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -77,6 +77,7 @@ in "rustup" "tinymist" "unzip" + "verible" "vhdl-ls" "vtsls" "wget"