From b6767bcd168fda4e349bbdf76f31abd8cadf1721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christopher=20M=C3=BChl?= <christopher@muehl.dev>
Date: Thu, 7 Aug 2025 10:54:32 +0200
Subject: [PATCH] Add disko as a flake input

---
 flake.lock                               | 21 +++++++++++++++++++++
 flake.nix                                |  8 ++++++++
 systems/x86_64-linux/cobalt/default.nix  |  4 ----
 systems/x86_64-linux/mercury/default.nix |  4 ----
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3019a6d..aad92b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -143,6 +143,26 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753140376,
+        "narHash": "sha256-7lrVrE0jSvZHrxEzvnfHFE/Wkk9DDqb+mYCodI5uuB8=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "545aba02960caa78a31bd9a8709a0ad4b6320a5c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "docker-compose-1": {
       "locked": {
         "lastModified": 1624397714,
@@ -856,6 +876,7 @@
         "agenix": "agenix",
         "agenix-rekey": "agenix-rekey",
         "darwin": "darwin_2",
+        "disko": "disko",
         "docker-compose-1": "docker-compose-1",
         "grub2-themes": "grub2-themes",
         "home-manager": "home-manager_2",
diff --git a/flake.nix b/flake.nix
index b79bf7b..5974eb1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,6 +29,10 @@
       systems.hosts = with inputs; {
         cobalt.modules = [
           grub2-themes.nixosModules.default
+          disko.nixosModules.default
+        ];
+        mercury.modules = [
+          disko.nixosModules.default
         ];
       };
 
@@ -71,6 +75,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Disk management via Nix
+    disko.url = "github:nix-community/disko";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
+
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     agenix-rekey.url = "github:oddlama/agenix-rekey";
diff --git a/systems/x86_64-linux/cobalt/default.nix b/systems/x86_64-linux/cobalt/default.nix
index 2721140..5567f0a 100644
--- a/systems/x86_64-linux/cobalt/default.nix
+++ b/systems/x86_64-linux/cobalt/default.nix
@@ -11,10 +11,6 @@
 with lib._elements; {
   imports = [
     ./hardware.nix
-    "${builtins.fetchTarball {
-      url = "https://github.com/nix-community/disko/archive/master.tar.gz";
-      sha256 = "0mzm7digdksivdhikxvrx6l0j2b9lj167ndcimsy9i24k4b91wsk";
-    }}/module.nix"
     ./disk-config.nix
     ./beszel-agent.nix
 
diff --git a/systems/x86_64-linux/mercury/default.nix b/systems/x86_64-linux/mercury/default.nix
index 12fbf2e..251c222 100644
--- a/systems/x86_64-linux/mercury/default.nix
+++ b/systems/x86_64-linux/mercury/default.nix
@@ -10,10 +10,6 @@
 with lib._elements; {
   imports = [
     ./hardware.nix
-    "${builtins.fetchTarball {
-      url = "https://github.com/nix-community/disko/archive/master.tar.gz";
-      sha256 = "0acvrmfhk86glp59dphbrp9xwcxd8r3zpn18760nzs4930nhhsi3";
-    }}/module.nix"
     ./disk-config.nix
   ];