docs/release-notes/rl-0.7.md

@@ -49,9 +49,3 @@ Release notes for release 0.7
 - Add [ocaml-lsp](https://github.com/ocaml/ocaml-lsp) support.
 
 - Fix Emac typo
-
-[diniamo](https://github.com/diniamo):
-
-- Move the `theme` dag entry to before `luaScript`.
-
-- Add rustfmt as the default formatter for Rust

modules/plugins/languages/rust.nix

@@ -4,33 +4,17 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.options) mkOption mkEnableOption;
   inherit (lib.strings) optionalString;
   inherit (lib.trivial) boolToString;
   inherit (lib.lists) isList optionals;
-  inherit (lib.types) bool package str listOf either enum;
+  inherit (lib.types) bool package str listOf either;
   inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.lua) expToLua;
   inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.languages.rust;
-
-  defaultFormat = "rustfmt";
-  formats = {
-    rustfmt = {
-      package = pkgs.rustfmt;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.rustfmt.with({
-            command = "${cfg.format.package}/bin/rustfmt",
-          })
-        )
-      '';
-    };
-  };
 in {
   options.vim.languages.rust = {
     enable = mkEnableOption "Rust language support";
@@ -65,22 +49,6 @@ in {
       };
     };
 
-    format = {
-      enable = mkEnableOption "Rust formatting" // {default = config.vim.languages.enableFormat;};
-
-      type = mkOption {
-        description = "Rust formatter to use";
-        type = enum (attrNames formats);
-        default = defaultFormat;
-      };
-
-      package = mkOption {
-        description = "Rust formatter package";
-        type = package;
-        default = formats.${cfg.format.type}.package;
-      };
-    };
-
     dap = {
       enable = mkOption {
         description = "Rust Debug Adapter support";
@@ -118,11 +86,6 @@ in {
       vim.treesitter.grammars = [cfg.treesitter.package];
     })
 
-    (mkIf cfg.format.enable {
-      vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.rust-format = formats.${cfg.format.type}.nullConfig;
-    })
-
     (mkIf (cfg.lsp.enable || cfg.dap.enable) {
       vim = {
         startPlugins = ["rust-tools"] ++ optionals cfg.dap.enable [cfg.dap.package];

modules/plugins/theme/theme.nix

@@ -45,12 +45,10 @@ in {
   config = mkIf cfg.enable {
     vim = {
       startPlugins = [cfg.name];
-      configRC.theme = entryBefore ["luaScript"] ''
-        lua << EOF
-        ${cfg.extraConfig}
-        ${supported_themes.${cfg.name}.setup (with cfg; {inherit style transparent;})}
-        EOF
-      '';
+      luaConfigRC = {
+        themeSetup = entryBefore ["theme"] cfg.extraConfig;
+        theme = supported_themes.${cfg.name}.setup (with cfg; {inherit style transparent;});
+      };
     };
   };
 }