diff --git a/flake.lock b/flake.lock index d20d3ea..600178a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,6 +1,43 @@ { "nodes": { "disko": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", + "owner": "nix-community", + "repo": "disko", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", + "type": "github" + }, + "original": { + "id": "disko", + "type": "indirect" + } + }, + "disko-stable-nixos": { + "inputs": { + "nixpkgs": [ + "nixpkgs-stable-nixos" + ] + }, + "locked": { + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", + "owner": "nix-community", + "repo": "disko", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, + "disko_2": { "inputs": { "nixpkgs": [ "nixverse", @@ -68,7 +105,7 @@ }, "nixos-anywhere": { "inputs": { - "disko": "disko", + "disko": "disko_2", "flake-parts": "flake-parts", "nixos-images": "nixos-images", "nixos-stable": "nixos-stable", @@ -146,8 +183,10 @@ "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable-nixos": { @@ -166,6 +205,20 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1750994206, + "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixverse": { "inputs": { "nix-darwin": "nix-darwin", @@ -190,7 +243,9 @@ }, "root": { "inputs": { - "nixpkgs": "nixpkgs", + "disko": "disko", + "disko-stable-nixos": "disko-stable-nixos", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable-nixos": "nixpkgs-stable-nixos", "nixverse": "nixverse" } diff --git a/flake.nix b/flake.nix index 93c8530..aecba53 100644 --- a/flake.nix +++ b/flake.nix @@ -1,16 +1,23 @@ { inputs = { + self.submodules = true; nixpkgs-stable-nixos.url = "github:nixos/nixpkgs/nixos-25.05"; nixverse = { url = "github:hgl/nixverse"; inputs.nixpkgs.follows = "nixpkgs-stable-nixos"; }; + + disko-stable-nixos = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs-stable-nixos"; + }; }; outputs = { self, nixpkgs, + disko, nixverse, ... }: diff --git a/nodes/lappy/configuration.nix b/nodes/lappy/configuration.nix index 553fc14..b18e448 100644 --- a/nodes/lappy/configuration.nix +++ b/nodes/lappy/configuration.nix @@ -8,6 +8,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ./disko.nix ]; # Use the systemd-boot EFI boot loader.