From e44a8fd148ed7de0a2385debb21588bba4b8098b Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Mon, 5 Feb 2024 22:17:51 +0900
Subject: [PATCH] Test

---
 keys/ssh/keys.txt                       | 5 -----
 nixos/hosts/nixos-framework/default.nix | 1 -
 nixos/hosts/nixos-framework/disks.nix   | 6 +-----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/keys/ssh/keys.txt b/keys/ssh/keys.txt
index 291ee70f..8efff55b 100644
--- a/keys/ssh/keys.txt
+++ b/keys/ssh/keys.txt
@@ -31,8 +31,3 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKLHGSk3WffS/mrSeehcM4O9eBx5cp7IMNYc842xprr3
 
 # (Fri Feb 02 08:17:00 AM JST 2024) Pixel 8
 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBui9k0ByK4ldcfJCTaEyoQoltcZ3w07B/5WBxvz7Nzd Pixel 8
-# (Sat Feb  3 11:06:06 JST 2024) albert@nixos-framework
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJenZ2+ytld6geSAYw9+/xcomdJTwgAYCqYKst0s0s9H albert@nixos-framework
-
-# (Sat Feb  3 11:24:23 AM JST 2024) albert@nixos-framework
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID4YDdeli3wF0a+ZMoSBTcOwWuhw+SeMilhGRDg5CJ+S albert@nixos-framework
diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix
index a88f6441..51c95c55 100644
--- a/nixos/hosts/nixos-framework/default.nix
+++ b/nixos/hosts/nixos-framework/default.nix
@@ -8,7 +8,6 @@
     # ../../common/modules/secureboot.nix
     ../../common/modules/boot.nix
     ../../common/modules/udev-rules.nix
-    # ../../common/modules/ssh-luks.nix
     ../../common/services/podman.nix
     # ../../common/services/tlp.nix
   ];
diff --git a/nixos/hosts/nixos-framework/disks.nix b/nixos/hosts/nixos-framework/disks.nix
index 3756c733..f5099501 100644
--- a/nixos/hosts/nixos-framework/disks.nix
+++ b/nixos/hosts/nixos-framework/disks.nix
@@ -3,10 +3,6 @@
   
   services.btrfs.autoScrub.enable = true;
   services.btrfs.autoScrub.interval = "weekly";
-  boot.initrd.secrets = {
-    # Create /mnt/etc/secrets/initrd directory and copy keys to it
-    "swap.key" = "/etc/secrets/initrd/swap.key";
-  };
 
   disko.devices.disk.nvme0 = {
     device = "/dev/nvme0n1";
@@ -78,7 +74,7 @@
             type = "luks";
             name = "SWAP";
             settings = {
-              keyFile = "/swap.key";
+              keyFile = "/mnt-root/etc/swap.key";
               allowDiscards = true;
             }; # content
             content = {