From 54af5b934616dff2d46ad9847326a7ebbf0f9809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= <dev@ntr.li>
Date: Wed, 15 Jan 2025 11:50:44 +0100
Subject: [PATCH] chore: Update sources

---
 .gitignore              |  1 +
 flake.lock              | 43 +++++++++++++----------------------------
 flake.nix               |  2 +-
 nix/tests/appliance.nix |  6 ++++--
 nix/tests/basic.nix     |  2 +-
 5 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 16666d4..c167e5d 100644
--- 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
index 6eb1301..c5860c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "lastModified": 1736143030,
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1736798957,
+        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
         "type": "github"
       },
       "original": {
@@ -73,22 +73,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1730741070,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -97,15 +81,14 @@
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        ]
       },
       "locked": {
-        "lastModified": 1731363552,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+        "lastModified": 1735882644,
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2941af5..e894167 100644
--- 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
index 7108f90..bb8fea7 100644
--- 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
index d923a43..8cb56d2 100644
--- a/nix/tests/basic.nix
+++ b/nix/tests/basic.nix
@@ -6,7 +6,7 @@
   ...
 }:
 {
-  name = "confext-basic";
+  name = "basic";
   nodes = {
     machine = _: {
       naext = {