From 812a7626523a166ae919f2302a35fc4a3d0ecd78 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Wed, 2 Apr 2025 23:31:25 -0400
Subject: [PATCH] Import disko through the flake inputs instead of
 fetchTarball.

---
 nix/configuration/configuration.nix |  6 ------
 nix/configuration/flake.lock        | 21 +++++++++++++++++++++
 nix/configuration/flake.nix         |  5 +++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix
index 049d36c..b4c83aa 100644
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -12,12 +12,6 @@
     ./roles/global_options
     ./util/unfree_polyfill
     ./roles/iso
-    "${
-      builtins.fetchTarball {
-        url = "https://github.com/nix-community/disko/archive/refs/tags/v1.9.0.tar.gz";
-        sha256 = "0j76ar4qz320fakdii4659w5lww8wiz6yb7g47npywqvf2lbp388";
-      }
-    }/module.nix"
     ./roles/boot
     ./roles/zfs
     ./roles/network
diff --git a/nix/configuration/flake.lock b/nix/configuration/flake.lock
index 424a1ab..79b7695 100644
--- a/nix/configuration/flake.lock
+++ b/nix/configuration/flake.lock
@@ -33,6 +33,26 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1743598667,
+        "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -283,6 +303,7 @@
     "root": {
       "inputs": {
         "ansible-sshjail": "ansible-sshjail",
+        "disko": "disko",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
diff --git a/nix/configuration/flake.nix b/nix/configuration/flake.nix
index d8880c3..7fe67a0 100644
--- a/nix/configuration/flake.nix
+++ b/nix/configuration/flake.nix
@@ -53,6 +53,10 @@
       # Optional but recommended to limit the size of your system closure.
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -85,6 +89,7 @@
           impermanence.nixosModules.impermanence
           home-manager.nixosModules.home-manager
           lanzaboote.nixosModules.lanzaboote
+          inputs.disko.nixosModules.disko
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;