From e7da962abb2fa053a2601211a0e56ded9ac779d1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 30 Oct 2022 07:03:32 -0400
Subject: [PATCH] formatter: Use mkTransposedPerSystemModule

---
 modules/formatter.nix | 54 ++++++++-----------------------------------
 1 file changed, 10 insertions(+), 44 deletions(-)

diff --git a/modules/formatter.nix b/modules/formatter.nix
index a63a9ba..d5b0435 100644
--- a/modules/formatter.nix
+++ b/modules/formatter.nix
@@ -1,55 +1,21 @@
 { config, lib, flake-parts-lib, ... }:
 let
   inherit (lib)
-    filterAttrs
-    mapAttrs
     mkOption
-    optionalAttrs
     types
     ;
   inherit (flake-parts-lib)
-    mkSubmoduleOptions
-    mkPerSystemOption
+    mkTransposedPerSystemModule
     ;
 in
-{
-  options = {
-    flake = mkSubmoduleOptions {
-      formatter = mkOption {
-        type = types.lazyAttrsOf types.package;
-        default = { };
-        description = ''
-          Per system package used by <literal>nix fmt</literal>.
-        '';
-      };
-    };
-
-    perSystem = mkPerSystemOption ({ config, ... }: {
-      _file = ./formatter.nix;
-      options = {
-        formatter = mkOption {
-          type = types.nullOr types.package;
-          default = null;
-          description = ''
-            A package used by <literal>nix fmt</literal>.
-          '';
-        };
-      };
-    });
-  };
-  config = {
-    flake.formatter =
-      mapAttrs
-        (k: v: v.formatter)
-        (filterAttrs
-          (k: v: v.formatter != null)
-          config.allSystems
-        );
-
-    perInput = system: flake:
-      optionalAttrs (flake?formatter.${system}) {
-        formatter = flake.formatter.${system};
-      };
-
+mkTransposedPerSystemModule {
+  name = "formatter";
+  option = mkOption {
+    type = types.nullOr types.package;
+    default = null;
+    description = ''
+      A package used by <literal>nix fmt</literal>.
+    '';
   };
+  file = ./formatter.nix;
 }