From 44821ea344b9083764f3f8896ec09cc8296454cc Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sun, 26 Feb 2023 20:03:39 -0500 Subject: [PATCH] fix disko partition for single disk --- apps/format-root.nix | 4 ++-- disks/root.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/format-root.nix b/apps/format-root.nix index 53200c5..c7449b4 100644 --- a/apps/format-root.nix +++ b/apps/format-root.nix @@ -23,7 +23,7 @@ --mode create \ --dry-run \ --flake "path:$(pwd)#root" \ - --arg disks '[ "/dev/$DISK" ]' + --arg disk \""/dev/''${DISK}"\" ${pkgs.gum}/bin/gum confirm \ "This will ERASE ALL DATA on the disk /dev/''${DISK}. Are you sure you want to continue?" \ @@ -32,7 +32,7 @@ ${pkgs.disko-packaged}/bin/disko \ --mode create \ --flake "path:$(pwd)#root" \ - --arg disks '[ '"/dev/$DISK"' ]' + --arg disk "/dev/''${DISK}" ''); diff --git a/disks/root.nix b/disks/root.nix index b64df37..c622b97 100644 --- a/disks/root.nix +++ b/disks/root.nix @@ -1,8 +1,8 @@ -{ disks ? [ ], ... }: { +{ disk, ... }: { disk = { boot = { type = "disk"; - device = builtins.elemAt disks 0; + device = disk; content = { type = "table"; format = "gpt";