disko: support nixos-install style flake syntax

2 files changed, 37 insertions, 14 deletions

diff --git a/cli.nix b/cli.nix
index ed80160..e29b340 100644
--- a/cli.nix
+++ b/cli.nix
@@ -1,14 +1,17 @@
 { pkgs ? import <nixpkgs> {}
 , mode ? "mount"
-, fromFlake ? null
-, diskoFile
+, flake ? null
+, flakeAttr ? null
+, diskoFile ? null
 , ... }@args:
 let
   disko = import ./. { };
-  diskFormat =
-    if fromFlake != null
-    then (builtins.getFlake fromFlake) + "/${diskoFile}"
-    else import diskoFile;
+
+  diskFormat = if flake != null then
+    (pkgs.lib.attrByPath [ "diskoConfigurations" flakeAttr ] (builtins.abort "${flakeAttr} does not exist") (builtins.getFlake flake)) args
+  else
+    import diskoFile args;
+
   diskoEval = if (mode == "create") then
     disko.createScript diskFormat pkgs
   else if (mode == "mount") then
diff --git a/disko b/disko
index d297832..3995103 100755
--- a/disko
+++ b/disko
@@ -27,6 +27,8 @@ Options:
   pass value to nix-build. can be used to set disk-names for example
 * --argstr name value
   pass value to nix-build as string
+* --dry-run
+  just show the path to the script instead of running it
 USAGE
 }
 
@@ -49,8 +51,7 @@ while [[ $# -gt 0 ]]; do
       shift
       ;;
     -f | --flake)
-      from_flake="$2"
-      nix_args+=("--argstr" "fromFlake" "$2")
+      flake="$2"
       shift
       ;;
     --argstr | --arg)
@@ -62,6 +63,12 @@ while [[ $# -gt 0 ]]; do
       showUsage
       exit 0
       ;;
+    --dry-run)
+      dry_run=y
+      ;;
+    --show-trace)
+      nix_args+=("$1")
+      ;;
     *)
       if [ -z ${disko_config+x} ]; then
         disko_config=$1
@@ -78,17 +85,30 @@ if ! ([[ $mode = "create" ]] || [[ $mode = "mount" ]]); then
   abort "mode must be either create or mount"
 fi
 
-if [[ -e "${disko_config+x}" ]]; then
+if [[ ! -z "${flake+x}" ]]; then
+  if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then
+   flake="${BASH_REMATCH[1]}"
+   flakeAttr="${BASH_REMATCH[2]}"
+  fi
+  if [[ -z "$flakeAttr" ]]; then
+    echo "Please specify the name of the NixOS configuration to be installed, as a URI fragment in the flake-uri."
+    echo "For example, to use the output diskoConfigurations.foo from the flake.nix, append \"#foo\" to the flake-uri."
+    exit 1
+  fi
+  nix_args+=("--arg" "flake" "$flake")
+  nix_args+=("--argstr" "flakeAttr" "$flakeAttr")
+elif [[ ! -z "${disko_config+x}" ]] && [[ -e "$disko_config" ]]; then
   nix_args+=("--arg" "diskoFile" "$disko_config")
-elif [[ -n "${from_flake+x}" ]]; then
-  nix_args+=("--argstr" "diskoFile" "$disko_config")
 else
-  abort "disko config must be an exising file of flake must be set"
+  abort "disko config must be an exising file or flake must be set"
 fi
 
 script=$(nix-build "${libexec_dir}"/cli.nix \
-  --argstr diskoFile "$disko_config" \
   --argstr mode "$mode" \
   "${nix_args[@]}"
 )
-exec "$script"
+if [[ ! -z "${dry_run+x}" ]]; then
+  echo "$script"
+else
+  exec "$script"
+fi