refactor: deprecate rome with mkRenamedOptionModule

cachix · Apr 16, 2024 · 8b255d0 · 8b255d0
1 parent d2b7a5b
commit 8b255d0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/modules/hooks.nix b/modules/hooks.nix
@@ -47,7 +47,9 @@ in
     })
     # Rename the remaining `settings.<name>` to `hooks.<name>.settings`
     ++ map (name: mkRenamedOptionModule [ "settings" name ] [ "hooks" name "settings" ])
-      [ "ansible-lint" "autoflake" "biome" "clippy" "cmake-format" "credo" "deadnix" "denofmt" "denolint" "dune-fmt" "eslint" "flake8" "headache" "hlint" "hpack" "isort" "latexindent" "lychee" "mkdocs-linkcheck" "mypy" "nixfmt" "ormolu" "php-cs-fixer" "phpcbf" "phpcs" "phpstan" "prettier" "psalm" "pylint" "pyright" "pyupgrade" "revive" "rome" "statix" ];
+      [ "ansible-lint" "autoflake" "biome" "clippy" "cmake-format" "credo" "deadnix" "denofmt" "denolint" "dune-fmt" "eslint" "flake8" "headache" "hlint" "hpack" "isort" "latexindent" "lychee" "mkdocs-linkcheck" "mypy" "nixfmt" "ormolu" "php-cs-fixer" "phpcbf" "phpcs" "phpstan" "prettier" "psalm" "pylint" "pyright" "pyupgrade" "revive" "statix" ]
+    # Rename `rome` hook to `biome`, since `biome` was being used in both hooks
+    ++ [ (mkRenamedOptionModule [ "hooks" "rome" ] [ "hooks" "biome" ]) ];
 
   options.hookModule = lib.mkOption {
     type = types.deferredModule;
@@ -73,7 +75,7 @@ in
   };
 
   # PLEASE keep this sorted alphabetically.
-  options.hooks = rec
+  options.hooks =
     {
       alejandra = mkOption {
         description = lib.mdDoc "alejandra hook";
@@ -1313,7 +1315,6 @@ in
           };
         };
       };
-      rome = biome;
       rustfmt = mkOption {
         description = lib.mdDoc ''
           Additional rustfmt settings
@@ -1639,7 +1640,7 @@ in
     };
 
   # PLEASE keep this sorted alphabetically.
-  config.hooks = mapAttrs (_: mapAttrs (_: mkDefault)) rec
+  config.hooks = mapAttrs (_: mapAttrs (_: mkDefault))
     {
       actionlint =
         {
@@ -3078,7 +3079,6 @@ lib.escapeShellArgs (lib.concatMap (ext: [ "--ghc-opt" "-X${ext}" ]) hooks.ormol
             "${hooks.ripsecrets.package}/bin/ripsecrets ${cmdArgs}";
           types = [ "text" ];
         };
-      rome = biome;
       ruff =
         {
           name = "ruff";