diff --git a/flake.nix b/flake.nix index 5af4418..7a280a1 100644 --- a/flake.nix +++ b/flake.nix @@ -155,6 +155,7 @@ buildbot = ./modules/nixos/buildbot.nix; builder = ./modules/nixos/builder.nix; community-builder = ./modules/nixos/community-builder; + disko-raid = ./modules/nixos/disko-raid.nix; github-org-backup = ./modules/nixos/github-org-backup.nix; hercules-ci = ./modules/nixos/hercules-ci; hydra = ./modules/nixos/hydra.nix; @@ -163,10 +164,6 @@ remote-builder = ./modules/nixos/remote-builder.nix; remote-workers = ./modules/nixos/remote-workers.nix; watch-store = ./modules/nixos/watch-store.nix; - disko-raid.imports = [ - inputs.disko.nixosModules.disko - ./modules/nixos/disko-raid.nix - ]; }; flake.lib.darwinSystem = args: diff --git a/modules/nixos/disko-raid.nix b/modules/nixos/disko-raid.nix index 048a011..dd03f19 100644 --- a/modules/nixos/disko-raid.nix +++ b/modules/nixos/disko-raid.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ inputs, lib, config, ... }: let mirrorBoot = idx: { type = "disk"; @@ -32,6 +32,9 @@ let }; in { + imports = [ + inputs.disko.nixosModules.disko + ]; options = { nixCommunity.disko.raidLevel = lib.mkOption { type = lib.types.int;