From b025dbac46c7942deab18bfe9939f5633f2ca8e1 Mon Sep 17 00:00:00 2001 From: Jay Looney Date: Thu, 11 Sep 2025 16:15:35 -0500 Subject: [PATCH] feat: include disko script for main desktop machine --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 8daf022..a50ca1f 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,26 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1757508292, + "narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", + "owner": "nix-community", + "repo": "disko", + "rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -196,6 +216,7 @@ }, "root": { "inputs": { + "disko": "disko", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index 707151c..f2a8b0f 100644 --- a/flake.nix +++ b/flake.nix @@ -9,9 +9,11 @@ lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + disko.url = "github:nix-community/disko"; + disko.inputs.nixpkgs.follows = "nixpkgs"; }; # https://nix.dev/tutorials/nix-language.html#named-attribute-set-argument - outputs = inputs@{self, nixpkgs, nixos-hardware, home-manager, sops-nix, lanzaboote, ...}: + outputs = inputs@{self, nixpkgs, nixos-hardware, home-manager, sops-nix, lanzaboote, disko, ...}: let mkSystem = (import ./lib { inherit nixpkgs home-manager inputs; @@ -40,6 +42,8 @@ ]; extraModules = [ { nixpkgs.config.allowUnfree = true; } + disko.nixosModules.disko + ./hosts/titanium/disko.nix # TODO: Import this in mkSystem if both the file and module exist. lanzaboote.nixosModules.lanzaboote ({ pkgs, lib, ... }: { environment.systemPackages = [ pkgs.sbctl ];