summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module.nix18
-rw-r--r--tests/lib.nix2
2 files changed, 0 insertions, 20 deletions
diff --git a/module.nix b/module.nix
index 47c52dd..9b568be 100644
--- a/module.nix
+++ b/module.nix
@@ -16,26 +16,8 @@ in {
type = lib.types.bool;
default = true;
};
- addScripts = lib.mkOption {
- description = ''
- add disko-create and disko-mount scripts to systemPackages.
- '';
- type = lib.types.bool;
- default = true;
- };
};
config = {
- environment.systemPackages = (lib.optionals cfg.addScripts [
- (pkgs.writers.writeDashBin "disko-create" ''
- export PATH=${lib.makeBinPath (types.diskoLib.packages cfg.devices pkgs)}
- ${types.diskoLib.create cfg.devices}
- '')
- (pkgs.writers.writeDashBin "disko-mount" ''
- export PATH=${lib.makeBinPath (types.diskoLib.packages cfg.devices pkgs)}
- ${types.diskoLib.mount cfg.devices}
- '')
- ]) ++ lib.optionals cfg.enableConfig (types.diskoLib.packages cfg.devices pkgs);
-
system.build.formatScript = pkgs.writers.writeDash "disko-create" ''
export PATH=${lib.makeBinPath (types.diskoLib.packages cfg.devices pkgs)}
${types.diskoLib.create cfg.devices}
diff --git a/tests/lib.nix b/tests/lib.nix
index 195abcc..3fb3486 100644
--- a/tests/lib.nix
+++ b/tests/lib.nix
@@ -33,7 +33,6 @@
(lib.optionalAttrs (testMode == "module") {
imports = [ ../module.nix ];
disko = {
- addScripts = false;
enableConfig = true;
devices = import disko-config { inherit disks lib; };
};
@@ -76,7 +75,6 @@
(lib.optionalAttrs (testMode == "module") {
imports = [ ../module.nix ];
disko = {
- addScripts = true;
enableConfig = false;
devices = import disko-config { disks = builtins.tail disks; inherit lib; };
};