Replace flake-utils with my own futils

1 files changed, 12 insertions, 25 deletions

diff --git a/flake.nix b/flake.nix
index 85a27ff..1b92321 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
+    futils.url = "git+https://git.sorre.xyz/miranb/futils";
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -38,39 +38,26 @@
   outputs =
     {
       nixpkgs,
-      flake-utils,
+      futils,
       nix-on-droid,
       ...
     }@inputs:
-    flake-utils.lib.eachDefaultSystem (
+    futils.lib.eachSystem (
       system:
       let
         pkgs = inputs.nixpkgs.legacyPackages.${system};
       in
       {
-        devShells.default =
-          let
-            stdenvMinimal = pkgs.stdenvNoCC.override {
-              cc = null;
-              preHook = "";
-              allowedRequisites = null;
-              initialPath = pkgs.lib.filter (
-                a: pkgs.lib.hasPrefix "coreutils" a.name
-              ) pkgs.stdenvNoCC.initialPath;
-              extraNativeBuildInputs = [ ];
-            };
-            minimalMkShell = pkgs.mkShell.override { stdenv = stdenvMinimal; };
-          in
-          minimalMkShell {
-            buildInputs = with pkgs; [
-              git
-              sops
+        devShells.default = futils.lib.minimalMkShell pkgs {
+          buildInputs = with pkgs; [
+            git
+            sops
 
-              # Formatting
-              treefmt
-              nixfmt-rfc-style
-            ];
-          };
+            # Formatting
+            treefmt
+            nixfmt-rfc-style
+          ];
+        };
       }
     )
     // {