chore: Update sources

frederictobiasc · Jan 15, 2025 · 54af5b9 · 54af5b9
1 parent cdab2f1
commit 54af5b9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,6 @@ TODO.MD
 # Local debugging
 img
 *.raw
+*.qcow2
 mnt/
 tree/
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -27,8 +27,8 @@
       systems = import inputs.systems;
       imports = [ inputs.pre-commit-hooks-nix.flakeModule ];
       flake.nixosModules = {
-        naext = import ./nix/module.nix;
         dm-verity = import ./nix/dm-verity.nix;
+        naext = import ./nix/module.nix;
       };
       perSystem =
         {

diff --git a/nix/tests/appliance.nix b/nix/tests/appliance.nix
@@ -37,8 +37,10 @@ in
             "esp" = {
               contents = {
                 # Necessary for the image to boot
-                "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
-                "/EFI/Linux/${config.system.boot.loader.ukiFile}".source = "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
+                "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =
+                  "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
+                "/EFI/Linux/${config.system.boot.loader.ukiFile}".source =
+                  "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
               };
               repartConfig = {
                 Type = "esp";

diff --git a/nix/tests/basic.nix b/nix/tests/basic.nix
@@ -6,7 +6,7 @@
   ...
 }:
 {
-  name = "confext-basic";
+  name = "basic";
   nodes = {
     machine = _: {
       naext = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,5 +8,6 @@ TODO.MD @@
     # Local debugging
     img
     *.raw
+    *.qcow2
     mnt/
     tree/