From 4f99cc5102a195a4a6fd522fc5e081eb058b42a1 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Mon, 23 Sep 2024 23:22:32 +0100
Subject: [PATCH 1/2] fix agenix pathspec

---
 flake.lock | 25 +++++--------------------
 flake.nix  |  2 +-
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index c0faff0..64e1b08 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,19 +6,19 @@
         "home-manager": "home-manager",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "systems": "systems"
+        ]
       },
       "locked": {
-        "lastModified": 1723293904,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "lastModified": 1703089996,
+        "narHash": "sha256-ipqShkBmHKC9ft1ZAsA6aeKps32k7+XZSPwfxeHLsAU=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "564595d0ad4be7277e07fa63b5a991b3c645655d",
         "type": "github"
       },
       "original": {
         "owner": "ryantm",
+        "ref": "0.15.0",
         "repo": "agenix",
         "type": "github"
       }
@@ -232,21 +232,6 @@
         "repo": "nixpkgs",
         "type": "github"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 4cafa05..ccca91a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,7 +18,7 @@
     nur.url = "github:nix-community/NUR";
 
     agenix = {
-      url = "github:ryantm/agenix?tag=0.15.0";
+      url = "github:ryantm/agenix/0.15.0";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         darwin.follows = "";

From 5ef9816a340520fceeeb1ad49a1e0530fa0975d2 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Mon, 23 Sep 2024 23:22:48 +0100
Subject: [PATCH 2/2] kilgharrah: enable zfs, luksdev

---
 hosts/kilgharrah/filesystems.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hosts/kilgharrah/filesystems.nix b/hosts/kilgharrah/filesystems.nix
index eb9f0c5..bfc5b10 100644
--- a/hosts/kilgharrah/filesystems.nix
+++ b/hosts/kilgharrah/filesystems.nix
@@ -2,9 +2,15 @@
 
 {
   boot.initrd.luks.devices = {
-    "enc".device = "/dev/disk/by-uuid/b414aaba-0a36-4135-a7e1-dc9489286acd";
+    "cryptroot".device = "/dev/disk/by-uuid/b414aaba-0a36-4135-a7e1-dc9489286acd";
   };
 
+  boot.supportedFilesystems = [ "zfs" ];
+
+  environment.etc.crypttab.text = ''
+    cryptstorage UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
+  '';
+
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-uuid/ad4cbc18-8849-40ed-b0bf-097f8f46346b";