diff --git a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/dev.nix b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/dev.nix index fcb2164d..102b2609 100644 --- a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/dev.nix +++ b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/dev.nix @@ -6,7 +6,7 @@ # Confirming these files are conforming. plugins.conform-nvim = { enable = true; - formatters = rec { + settings.formatters = rec { bash = [ "shfmt" ]; c = lib.singleton [ "clang_format" ]; cpp = c; diff --git a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/lsp.nix b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/lsp.nix index 63069362..5b2b013d 100644 --- a/configs/home-manager/foo-dogsquared/modules/programs/nixvim/lsp.nix +++ b/configs/home-manager/foo-dogsquared/modules/programs/nixvim/lsp.nix @@ -12,19 +12,19 @@ cssls.enable = true; # For CSS. denols.enable = true; # For Deno runtime. dockerls.enable = true; # For Dockerfiles. - emmet-ls.enable = true; # For emmet support. + emmet_ls.enable = true; # For emmet support. eslint.enable = true; # For JavaScript. html.enable = true; # For HTML. jsonls.enable = true; # There's one for JSON? lemminx.enable = true; # And for XML? ltex.enable = true; # And for LanguageTool, too? - lua-ls.enable = true; # For Lua. + lua_ls.enable = true; # For Lua. nixd.enable = true; # For Nix. nushell.enable = true; # For Nushell. pyright.enable = true; # For Python. # For Rust (even though I barely use it). - rust-analyzer = { + rust_analyzer = { enable = true; installRustc = false; }; @@ -32,6 +32,6 @@ solargraph.enable = true; # For Ruby. tailwindcss.enable = true; # For Tailwind CSS. terraformls.enable = true; # For Terraform. - tsserver.enable = true; # For TypeScript. + ts_ls.enable = true; # For TypeScript. }; } diff --git a/configs/nixvim/fiesta/modules/setups/snippets/default.nix b/configs/nixvim/fiesta/modules/setups/snippets/default.nix index 648fb614..114f7101 100644 --- a/configs/nixvim/fiesta/modules/setups/snippets/default.nix +++ b/configs/nixvim/fiesta/modules/setups/snippets/default.nix @@ -15,7 +15,7 @@ in config = lib.mkIf cfg.enable { # The main star of the show. plugins.luasnip.enable = true; - plugins.luasnip.extraConfig = { + plugins.luasnip.settings = { keep_roots = true; link_roots = true; link_children = true;