From 5fd29dfeb3931fa23ea41ea743201ebf8525dc4d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 9 Nov 2022 23:36:40 +0100
Subject: disko: support nixos-install style flake syntax

---
 cli.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'cli.nix')

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
-- 
cgit v1.2.3