diff --git a/flake.nix b/flake.nix index 168350cd..cae504cd 100644 --- a/flake.nix +++ b/flake.nix @@ -57,7 +57,10 @@ in # FIXME: aarch64-linux seems to hang on boot nixpkgs.lib.optionalAttrs pkgs.hostPlatform.isx86_64 (nixosTests // { inherit disko-install; }) // - pkgs.lib.optionalAttrs (!pkgs.buildPlatform.isRiscV64 && !pkgs.hostPlatform.isx86_32) { inherit shellcheck; }); + pkgs.lib.optionalAttrs (!pkgs.buildPlatform.isRiscV64 && !pkgs.hostPlatform.isx86_32) { + inherit shellcheck; + inherit (self.packages.${system}) disko-doc; + }); nixosConfigurations.testmachine = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/lib/types/lvm_vg.nix b/lib/types/lvm_vg.nix index 54d74500..dbe29e23 100644 --- a/lib/types/lvm_vg.nix +++ b/lib/types/lvm_vg.nix @@ -22,6 +22,9 @@ priority = lib.mkOption { type = lib.types.int; default = if (lib.hasInfix "100%" lv.config.size) then 9001 else 1000; + defaultText = lib.literalExpression '' + if (lib.hasInfix "100%" lv.config.size) then 9001 else 1000 + ''; description = "Priority of the logical volume, smaller values are created first"; }; size = lib.mkOption {