From b5b52426dc7ecd0a2635012c28f7ac783e063258 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foo.dogsquared@gmail.com>
Date: Sat, 3 Dec 2022 13:44:40 +0800
Subject: [PATCH] config: restructure user and host files

---
 hosts/ni/default.nix                                          | 3 ---
 hosts/ni/files/age-key.pub                                    | 1 +
 hosts/ni/{host-key.pub => files/ssh-key.pub}                  | 0
 hosts/plover/files/age-key.pub                                | 1 +
 hosts/plover/files/{host-key.pub => ssh-key.pub}              | 0
 users/home-manager/foo-dogsquared/files/age-key.pub           | 1 +
 .../foo-dogsquared/{user-key.pub => files/ssh-key.pub}        | 0
 users/nixos/admin/default.nix                                 | 4 ++--
 users/nixos/plover/default.nix                                | 4 ++--
 9 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 hosts/ni/files/age-key.pub
 rename hosts/ni/{host-key.pub => files/ssh-key.pub} (100%)
 create mode 100644 hosts/plover/files/age-key.pub
 rename hosts/plover/files/{host-key.pub => ssh-key.pub} (100%)
 create mode 100644 users/home-manager/foo-dogsquared/files/age-key.pub
 rename users/home-manager/foo-dogsquared/{user-key.pub => files/ssh-key.pub} (100%)

diff --git a/hosts/ni/default.nix b/hosts/ni/default.nix
index aca2ba25..3e291b4e 100644
--- a/hosts/ni/default.nix
+++ b/hosts/ni/default.nix
@@ -19,9 +19,6 @@
       isNormalUser = true;
       createHome = true;
       home = "/home/foo-dogsquared";
-      openssh.authorizedKeys.keyFiles = [
-        ../../users/home-manager/foo-dogsquared/user-key.pub
-      ];
     })
   ];
 
diff --git a/hosts/ni/files/age-key.pub b/hosts/ni/files/age-key.pub
new file mode 100644
index 00000000..21efca79
--- /dev/null
+++ b/hosts/ni/files/age-key.pub
@@ -0,0 +1 @@
+age1dm9xugju4q5gx0zty8ckw655ea904c64gv9qw9fn3lu507ck8uzsag59y8
diff --git a/hosts/ni/host-key.pub b/hosts/ni/files/ssh-key.pub
similarity index 100%
rename from hosts/ni/host-key.pub
rename to hosts/ni/files/ssh-key.pub
diff --git a/hosts/plover/files/age-key.pub b/hosts/plover/files/age-key.pub
new file mode 100644
index 00000000..1cbe7eb2
--- /dev/null
+++ b/hosts/plover/files/age-key.pub
@@ -0,0 +1 @@
+age1sj497yr895335rk77qqnrqyx9f7462ma3lz0a0x3w5cnla5uqgpspgggtz
diff --git a/hosts/plover/files/host-key.pub b/hosts/plover/files/ssh-key.pub
similarity index 100%
rename from hosts/plover/files/host-key.pub
rename to hosts/plover/files/ssh-key.pub
diff --git a/users/home-manager/foo-dogsquared/files/age-key.pub b/users/home-manager/foo-dogsquared/files/age-key.pub
new file mode 100644
index 00000000..94f19c46
--- /dev/null
+++ b/users/home-manager/foo-dogsquared/files/age-key.pub
@@ -0,0 +1 @@
+age1say65zc678yc03tx4zexp20c9gvskvwrm4390j4x2jkepn97duhq9ptuj9
diff --git a/users/home-manager/foo-dogsquared/user-key.pub b/users/home-manager/foo-dogsquared/files/ssh-key.pub
similarity index 100%
rename from users/home-manager/foo-dogsquared/user-key.pub
rename to users/home-manager/foo-dogsquared/files/ssh-key.pub
diff --git a/users/nixos/admin/default.nix b/users/nixos/admin/default.nix
index 91c79e4c..c8655d4a 100644
--- a/users/nixos/admin/default.nix
+++ b/users/nixos/admin/default.nix
@@ -10,8 +10,8 @@
     extraGroups = [ "wheel" ];
     useDefaultShell = true;
     openssh.authorizedKeys.keyFiles = [
-      ../../home-manager/foo-dogsquared/user-key.pub
-      ../../../hosts/ni/host-key.pub
+      ../../home-manager/foo-dogsquared/files/ssh-key.pub
+      ../../../hosts/ni/files/ssh-key.pub
     ];
   };
 
diff --git a/users/nixos/plover/default.nix b/users/nixos/plover/default.nix
index 2d58b4f3..696d71f5 100644
--- a/users/nixos/plover/default.nix
+++ b/users/nixos/plover/default.nix
@@ -10,8 +10,8 @@
     description = "The go-to user for server systems.";
 
     openssh.authorizedKeys.keyFiles = [
-      ../../home-manager/foo-dogsquared/user-key.pub
-      ../../../hosts/ni/host-key.pub
+      ../../home-manager/foo-dogsquared/files/ssh-key.pub
+      ../../../hosts/ni/files/ssh-key.pub
     ];
   };
 }