Drezil/nixos-nas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: wire in nix-community/disko + pass disks via specialArgs

Browse Source
This commit is contained in:
Nicole Dresselhaus 2025-06-10 21:51:47 +02:00
parent 00370ca851
commit d4a4df8feb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disko.nix
View File

@ -1,5 +1,5 @@
# disko.nix – Root-on-ZFS (rpool) + Datenpool (tank) # disko.nix – Root-on-ZFS (rpool) + Datenpool (tank)
{ disks ? [ "/dev/nvme0n1" ], lib, ... }: { disks, ... }:
{ {
disko.devices = { disko.devices = {

6
flake.nix
View File

@ -6,18 +6,22 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
# optional: Hardware-Tuning (z. B. SSD-Defaults) # optional: Hardware-Tuning (z. B. SSD-Defaults)
nixos-hardware.url = "github:NixOS/nixos-hardware"; 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 let
system = "x86_64-linux"; system = "x86_64-linux";
in { in {
nixosConfigurations.host = nixpkgs.lib.nixosSystem { nixosConfigurations.host = nixpkgs.lib.nixosSystem {
inherit system; # ← Pflichtfeld inherit system; # ← Pflichtfeld
specialArgs.disks = [ "/dev/nvme0n1" ];
modules = [ modules = [
./hardware/hardware-configuration.nix # generiertes hardware-configuration.nix ./hardware/hardware-configuration.nix # generiertes hardware-configuration.nix
./configuration.nix # deine eigentliche Config ./configuration.nix # deine eigentliche Config
./disko.nix # disko partitionierung ./disko.nix # disko partitionierung
disko.nixosModules.disko
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
]; ];
}; };