switch from alejandra to nixfmt

catgirl-v · Feb 13, 2025 · ff01720 · ff01720
1 parent f6ed681
commit ff01720
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 212 deletions.
diff --git a/.treefmt.toml b/.treefmt.toml
@@ -1,9 +1,9 @@
 formatters = [
-  "alejandra",
+  "nixfmt",
 ]
 
-[formatter.alejandra]
-command = "alejandra"
+[formatter.nixfmt]
+command = "nixfmt"
 includes = ["*.nix"]
-options = []
+options = ["-v"]
 priority = 0
diff --git a/flake.nix b/flake.nix
@@ -9,71 +9,58 @@
     };
   };
 
-  outputs = inputs: let
-    inherit (inputs) self;
-    inherit (inputs.nixpkgs) lib;
-    inherit
-      (lib)
-      dontRecurseIntoAttrs
-      genAttrs
-      ;
-    forAllSystems = genAttrs systems;
-    systems = lib.systems.flakeExposed;
-  in {
-    devShells = forAllSystems (system: let
-      formatter' = self.formatter.${system};
-      legacyPackages' = self.legacyPackages.${system};
-      inherit (legacyPackages') nixpkgs;
+  outputs = inputs:
+    let
+      inherit (inputs) self;
+      inherit (inputs.nixpkgs) lib;
+      inherit (lib) dontRecurseIntoAttrs genAttrs;
+      forAllSystems = genAttrs systems;
+      systems = lib.systems.flakeExposed;
     in {
-      default = nixpkgs.callPackage ({
-        alejandra,
-        mkShellNoCC,
-        treefmt,
-      }:
-        mkShellNoCC {
-          nativeBuildInputs = [alejandra treefmt];
-        }) {};
-    });
+      devShells = forAllSystems (system:
+        let
+          formatter' = self.formatter.${system};
+          legacyPackages' = self.legacyPackages.${system};
+          inherit (legacyPackages') nixpkgs;
+        in {
+          default = nixpkgs.callPackage ({ nixfmt, mkShellNoCC, treefmt, }:
+            mkShellNoCC { nativeBuildInputs = [ nixfmt treefmt ]; }) { };
+        });
 
-    formatter = forAllSystems (system: let
-      legacyPackages' = self.legacyPackages.${system};
-      inherit (legacyPackages') nixpkgs;
-    in
-      nixpkgs.callPackage ({
-        alejandra,
-        writeShellApplication,
-        treefmt,
-      }:
-        writeShellApplication {
-          name = "formatter";
-          text = ''
-            treefmt "''${@-.}"
-          '';
-          runtimeInputs = [alejandra treefmt];
-        }) {});
+      formatter = forAllSystems (system:
+        let
+          legacyPackages' = self.legacyPackages.${system};
+          inherit (legacyPackages') nixpkgs;
+        in nixpkgs.callPackage ({ nixfmt, writeShellApplication, treefmt, }:
+          writeShellApplication {
+            name = "formatter";
+            text = ''
+              treefmt "''${@-.}"
+            '';
+            runtimeInputs = [ nixfmt treefmt ];
+          }) { });
 
-    packages = forAllSystems (system: let
-      legacyPackages' = self.legacyPackages.${system};
-      inherit (legacyPackages') nixpkgs;
-    in {
-      default = legacyPackages'.pack-hardmode;
-    });
+      packages = forAllSystems (system:
+        let
+          legacyPackages' = self.legacyPackages.${system};
+          inherit (legacyPackages') nixpkgs;
+        in { default = legacyPackages'.pack-hardmode; });
 
-    legacyPackages = forAllSystems (system: let
-      nixpkgs = dontRecurseIntoAttrs (import inputs.nixpkgs {
-        inherit system;
-        overlays = [
-          self.overlays.default
-          (final: prev:
-            import inputs.nix2container {
-              pkgs = final;
-              inherit system;
-            })
-        ];
-      });
-    in
-      {inherit nixpkgs;} // nixpkgs.pissfactory);
+      legacyPackages = forAllSystems (system:
+        let
+          nixpkgs = dontRecurseIntoAttrs (import inputs.nixpkgs {
+            inherit system;
+            overlays = [
+              self.overlays.default
+              (final: prev:
+                import inputs.nix2container {
+                  pkgs = final;
+                  inherit system;
+                })
+            ];
+          });
+        in { inherit nixpkgs; } // nixpkgs.pissfactory);
 
-    overlays.default = import ./overlay.nix;
-  };
+      overlays.default = import ./overlay.nix;
+    };
 }
diff --git a/jre.nix b/jre.nix
@@ -1,34 +1,28 @@
-{
-  stdenv,
-  jdk17_headless,
-  lib,
-  callPackage,
-}: let
-  jdk = jdk17_headless;
-in
-  stdenv.mkDerivation {
-    pname = "${jdk.pname}-minimal-jre";
-    version = jdk.version;
+{ stdenv, jdk17_headless, lib, callPackage, }:
+let jdk = jdk17_headless;
+in stdenv.mkDerivation {
+  pname = "${jdk.pname}-minimal-jre";
+  version = jdk.version;
 
-    buildInputs = [jdk];
+  buildInputs = [ jdk ];
 
-    dontUnpack = true;
+  dontUnpack = true;
 
-    # Strip more heavily than the default '-S', since if you're
-    # using this derivation you probably care about this.
-    stripDebugFlags = ["--strip-unneeded"];
+  # Strip more heavily than the default '-S', since if you're
+  # using this derivation you probably care about this.
+  stripDebugFlags = [ "--strip-unneeded" ];
 
-    buildPhase = ''
-      runHook preBuild
+  buildPhase = ''
+    runHook preBuild
 
-      mkdir modpath
-      ln -s ${jdk}/lib/openjdk/jmods/* modpath
-      # jpackage includes path references to the base JDK in some native binaries
-      rm modpath/jdk.jpackage.jmod
-      jlink --module-path modpath --add-modules ALL-MODULE-PATH --compress=2 --output $out
+    mkdir modpath
+    ln -s ${jdk}/lib/openjdk/jmods/* modpath
+    # jpackage includes path references to the base JDK in some native binaries
+    rm modpath/jdk.jpackage.jmod
+    jlink --module-path modpath --add-modules ALL-MODULE-PATH --compress=2 --output $out
 
-      runHook postBuild
-    '';
+    runHook postBuild
+  '';
 
-    dontInstall = true;
-  }
+  dontInstall = true;
+}
diff --git a/overlay.nix b/overlay.nix
@@ -1,6 +1,5 @@
-final: prev: let
+final: prev:
+let
   inherit (final) callPackage lib;
   inherit (lib) recurseIntoAttrs;
-in {
-  pissfactory = recurseIntoAttrs (callPackage ./packages.nix {});
-}
+in { pissfactory = recurseIntoAttrs (callPackage ./packages.nix { }); }