Replace flake-utils with my own futils

2 files changed, 23 insertions, 36 deletions

diff --git a/flake.lock b/flake.lock
index 9d2ca5e..1203d76 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,22 +54,22 @@
         "type": "github"
       }
     },
-    "flake-utils": {
+    "futils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
+        "lastModified": 1722472559,
+        "narHash": "sha256-HqzEdURUwgCNDpopDC38NbChC0cOyj1L47EP+1aco8k=",
+        "ref": "refs/heads/main",
+        "rev": "aaa51589dd772073c6eb48d6b7bd51dc8be3b455",
+        "revCount": 4,
+        "type": "git",
+        "url": "https://git.sorre.xyz/miranb/futils"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
+        "type": "git",
+        "url": "https://git.sorre.xyz/miranb/futils"
       }
     },
     "gitignore": {
@@ -354,7 +354,7 @@
     "root": {
       "inputs": {
         "disko": "disko",
-        "flake-utils": "flake-utils",
+        "futils": "futils",
         "home-manager": "home-manager",
         "nix-on-droid": "nix-on-droid",
         "nixpkgs": "nixpkgs",
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
+          ];
+        };
       }
     )
     // {