Merge 8268f13bdd into 57067e85ed

docs/release-notes/rl-0.7.md

@@ -285,9 +285,6 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to
 - Add [](#opt-vim.spellcheck.extraSpellWords) to allow adding arbitrary
   spellfiles to Neovim's runtime with ease.
 
-- Add combined nvf configuration (`config.vim`) into the final package's
-  passthru as `passthru.neovimConfiguration` for easier debugging.
-
 [ppenguin](https://github.com/ppenguin):
 
 - Telescope:
@@ -305,8 +302,6 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to
   `vim.languages.kotlin`
 - changed default keybinds for leap.nvim to avoid altering expected behavior
 - Add LSP, formatter and Treesitter support for Vala under `vim.languages.vala`
-- Add [Tinymist](https://github.com/Myriad-Dreamin/tinymist] as a formatter for
-  the Typst language module.
 
 [Bloxx12](https://github.com/Bloxx12)
 
@@ -331,3 +326,4 @@ To migrate to `nixfmt`, simply change `vim.languages.nix.format.type` to
 [Nowaaru](https://github.com/Nowaaru):
 
 - Add `precognition-nvim`.
+

modules/default.nix

@@ -123,11 +123,6 @@ in {
     paths = [neovim-wrapped printConfig printConfigPath];
     postBuild = "echo Helpers added";
 
-    # Allow evaluating vimOptions, i.e., config.vim from the packages' passthru
-    # attribute. For example, packages.x86_64-linux.neovim.passthru.neovimConfig
-    # will return the configuration in full.
-    passthru.neovimConfig = vimOptions;
-
     meta = {
       description = "Wrapped version of Neovim with additional helper scripts";
       mainProgram = "nvim";

modules/plugins/languages/typst.nix

@@ -14,38 +14,6 @@
 
   cfg = config.vim.languages.typst;
 
-  defaultServer = "tinymist";
-  servers = {
-    typst-lsp = {
-      package = pkgs.typst-lsp;
-      lspConfig = ''
-        lspconfig.typst_lsp.setup {
-          capabilities = capabilities,
-          on_attach = default_on_attach,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/typst-lsp"}''
-        },
-        }
-      '';
-    };
-    tinymist = {
-      package = pkgs.tinymist;
-      lspConfig = ''
-        lspconfig.tinymist.setup {
-          capabilities = capabilities,
-          on_attach = default_on_attach,
-          cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${cfg.lsp.package}/bin/tinymist"}''
-        },
-        }
-      '';
-    };
-  };
-
   defaultFormat = "typstfmt";
   formats = {
     typstfmt = {
@@ -84,17 +52,11 @@ in {
     lsp = {
       enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.languages.enableLSP;};
 
-      server = mkOption {
-        description = "Typst LSP server to use";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
-
       package = mkOption {
         description = "typst-lsp package, or the command to run as a list of strings";
         example = ''[lib.getExe pkgs.jdt-language-server "-data" "~/.cache/jdtls/workspace"]'';
         type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
+        default = pkgs.typst-lsp;
       };
     };
 
@@ -120,14 +82,19 @@ in {
       vim.treesitter.grammars = [cfg.treesitter.package];
     })
 
-    (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.typst-format = formats.${cfg.format.type}.nullConfig;
-    })
-
     (mkIf cfg.lsp.enable {
       vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.typst-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.lspconfig.sources.typst-lsp = ''
+        lspconfig.typst_lsp.setup {
+          capabilities = capabilities,
+          on_attach=default_on_attach,
+          cmd = ${
+          if isList cfg.lsp.package
+          then expToLua cfg.lsp.package
+          else ''{"${cfg.lsp.package}/bin/typst-lsp"}''
+        },
+        }
+      '';
     })
   ]);
 }

modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix

@@ -16,7 +16,7 @@ in {
     enable = mkEnableOption "Neovim dev icons [nvim-web-devicons]";
 
     setupOpts = mkPluginSetupOption "nvim-web-devicons" {
-      color_icons = mkEnableOption "different highlight colors per icon" // {default = true;};
+      color_icons = mkEnableOption "different highlight colors per icon";
       variant = mkOption {
         type = nullOr (enum ["light" "dark"]);
         default = null;

modules/wrapper/lazy/lazy.nix

@@ -189,7 +189,7 @@ in {
     };
 
     plugins = mkOption {
-      default = {};
+      default = [];
       type = attrsOf lznPluginType;
       description = ''
         Plugins to lazy load.