From d4a4df8feb929415e12545f6e4ac4e6aaae728cc Mon Sep 17 00:00:00 2001 From: Nicole Dresselhaus Date: Tue, 10 Jun 2025 21:51:47 +0200 Subject: [PATCH] feat: wire in nix-community/disko + pass disks via specialArgs --- disko.nix | 2 +- flake.nix | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/disko.nix b/disko.nix index eb96ccd..ace68af 100644 --- a/disko.nix +++ b/disko.nix @@ -1,5 +1,5 @@ # disko.nix – Root-on-ZFS (rpool) + Datenpool (tank) -{ disks ? [ "/dev/nvme0n1" ], lib, ... }: +{ disks, ... }: { disko.devices = { diff --git a/flake.nix b/flake.nix index c54c9d6..79d1ee5 100644 --- a/flake.nix +++ b/flake.nix @@ -6,18 +6,22 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # optional: Hardware-Tuning (z. B. SSD-Defaults) nixos-hardware.url = "github:NixOS/nixos-hardware"; + disko.url = "github:nix-community/disko"; + disko.inputs.nixpkgs.follows = "nixpkgs"; # hält beide auf demselben commit }; - outputs = { self, nixpkgs, nixos-hardware, ... }@inputs: + outputs = { self, nixpkgs, disko, nixos-hardware, ... }@inputs: let system = "x86_64-linux"; in { nixosConfigurations.host = nixpkgs.lib.nixosSystem { inherit system; # ← Pflichtfeld + specialArgs.disks = [ "/dev/nvme0n1" ]; modules = [ ./hardware/hardware-configuration.nix # generiertes hardware-configuration.nix ./configuration.nix # deine eigentliche Config ./disko.nix # disko partitionierung + disko.nixosModules.disko nixos-hardware.nixosModules.common-pc-ssd ]; };