test

nixos/common/modules/installer.nix

@@ -65,7 +65,8 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
   sudo nixos-install --no-root-password --flake ".#$TARGET_HOST"
 
   # Rsync nix-config to the target install.
-  rsync -a --delete "/tmp/nixos/git/" "/mnt/etc/nixos/git/"
+  sudo mkdir -p "/mnt/etc/nixos"
+  sudo rsync -a --delete "/tmp/nixos/git/" "/mnt/etc/nixos/git/"
   pushd "/mnt/etc/nixos/git/"
   popd
 

nixos/hosts/nixos-vm-02/default.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, modulesPath, desktop, username, ... }: {
   imports = [ 
     # This machine won't be using secureboot
-    ../../common/modules/bootloader.nix
+    ../../common/modules/secureboot.nix
     ./disks.nix 
   ];
   nixpkgs.config.allowUnfree = false;

nixos/hosts/nixos-vm-02/disks.nix

@@ -2,15 +2,14 @@
   boot.loader.grub.device = "/dev/sda";
   boot.initrd.luks.devices."sda2".device = "/dev/sda2";
 
-  disko.devices = {
-    disk = {
-      sda = {
+  disko.devices.disk.sda = {
     device = "/dev/sda";
     content = {
       type = "table";
       format = "gpt";
       partitions = [ 
         {
+          type = "partition";
           name = "BOOT";
           start = "0%";
           end = "550MiB";
@@ -24,17 +23,18 @@
           };
         } # partition 1
         { 
-              name = "ROOT";
+          type = "partition";
+          name = "LUKS";
           start = "550MiB";
           end = "100%";
           content = {
             type = "luks";
             name = "LUKS-ROOT";
             extraOpenArgs = [ "--allow-discards" ];
-                settings.keyFile = "/tmp/secret.key";
+            # settings.keyFile = "/tmp/secret.key";
             content = {
               type = "btrfs";
-                  extraArgs = [ "-f" ];
+              # extraArgs = [ "-f" ];
               subvolumes = {
                 "/root" = {
                   mountpoint = "/";
@@ -54,7 +54,5 @@
         } # partition 2
       ]; # partitions
     }; # content
-      }; # sda
-    }; # disk
-  }; # disko.devices
+  }; # disko.devices.disk.sda
 } # root