From b4a9bd2d89a7ed863f77dfa286ce115ffce73526 Mon Sep 17 00:00:00 2001
From: Madeleine Sydney <lomiskiam@gmail.com>
Date: Tue, 18 Feb 2025 21:11:43 -0700
Subject: [PATCH] fix: SSH key fixes

---
 public-keys/crumb.pub                           | 1 -
 public-keys/{ => ssh}/crumb-at-guix-rebound.pub | 0
 public-keys/ssh/crumb-at-nixos-testbed.pub      | 1 +
 public-keys/{ => ssh}/crumble-at-fruitbook.pub  | 0
 public-keys/{ => ssh}/lain-at-deertopia.pub     | 0
 users/crumb/default.nix                         | 2 +-
 users/crumb/files.nix                           | 7 +++++++
 users/crumb/programs/emacs/modules/syd-ui.el    | 2 +-
 users/lain/default.nix                          | 6 ++++--
 users/lain/files.nix                            | 9 +++++++++
 10 files changed, 23 insertions(+), 5 deletions(-)
 delete mode 100644 public-keys/crumb.pub
 rename public-keys/{ => ssh}/crumb-at-guix-rebound.pub (100%)
 create mode 100644 public-keys/ssh/crumb-at-nixos-testbed.pub
 rename public-keys/{ => ssh}/crumble-at-fruitbook.pub (100%)
 rename public-keys/{ => ssh}/lain-at-deertopia.pub (100%)
 create mode 100644 users/lain/files.nix

diff --git a/public-keys/crumb.pub b/public-keys/crumb.pub
deleted file mode 100644
index 7b69cdc..0000000
--- a/public-keys/crumb.pub
+++ /dev/null
@@ -1 +0,0 @@
-age1qayk0d0f765v57pedm7mtau6qkmv8rh6jtaqm40g5g9armaty4jqc0v0y2
diff --git a/public-keys/crumb-at-guix-rebound.pub b/public-keys/ssh/crumb-at-guix-rebound.pub
similarity index 100%
rename from public-keys/crumb-at-guix-rebound.pub
rename to public-keys/ssh/crumb-at-guix-rebound.pub
diff --git a/public-keys/ssh/crumb-at-nixos-testbed.pub b/public-keys/ssh/crumb-at-nixos-testbed.pub
new file mode 100644
index 0000000..de4b33c
--- /dev/null
+++ b/public-keys/ssh/crumb-at-nixos-testbed.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPVnrTT1npsdy8f6CCdmRdTMExSgVpTKgGVtq1wAaTZV crumb@nixos-testbed
diff --git a/public-keys/crumble-at-fruitbook.pub b/public-keys/ssh/crumble-at-fruitbook.pub
similarity index 100%
rename from public-keys/crumble-at-fruitbook.pub
rename to public-keys/ssh/crumble-at-fruitbook.pub
diff --git a/public-keys/lain-at-deertopia.pub b/public-keys/ssh/lain-at-deertopia.pub
similarity index 100%
rename from public-keys/lain-at-deertopia.pub
rename to public-keys/ssh/lain-at-deertopia.pub
diff --git a/users/crumb/default.nix b/users/crumb/default.nix
index dd458ec..182fd9c 100755
--- a/users/crumb/default.nix
+++ b/users/crumb/default.nix
@@ -8,7 +8,7 @@
       "$y$j9T$aEFDDwdTZbAc6VQRXrkBJ0$K8wxTGTWDihyX1wxJ.ZMH//wmQFfrGGUkLkxIU0Lyq8";
 
     openssh.authorizedKeys.keyFiles = [
-      ../../public-keys/crumb-at-guix-rebound.pub
+      ../../public-keys/ssh/crumb-at-guix-rebound.pub
     ];
   };
 
diff --git a/users/crumb/files.nix b/users/crumb/files.nix
index adba67d..4e6feb5 100755
--- a/users/crumb/files.nix
+++ b/users/crumb/files.nix
@@ -2,6 +2,13 @@
 
 let mutableSymlink = config.lib.file.mkOutOfStoreSymlink;
 in lib.mkMerge [
+  {
+    home.file.".ssh/id_ed25519".source =
+      mutableSymlink "/persist/private-keys/ssh/crumb-at-nixos-testbed";
+    home.file.".ssh/id_ed25519.pub".source =
+      ../../public-keys/ssh/crumb-at-nixos-testbed.pub;
+  }
+
   {
     ### Some basic impermanence setup.
 
diff --git a/users/crumb/programs/emacs/modules/syd-ui.el b/users/crumb/programs/emacs/modules/syd-ui.el
index 1a8fab8..87b8707 100755
--- a/users/crumb/programs/emacs/modules/syd-ui.el
+++ b/users/crumb/programs/emacs/modules/syd-ui.el
@@ -130,10 +130,10 @@ for example when calling `shell'.")
         (current-buffer))))))
 
 (with-eval-after-load 'comint
+  (require 'syd-kanagawa)
   (custom-theme-set-faces
    'user
    ;; Default prompt face is very ugly.  Give it a more subtle look.
-   (require 'syd-kanagawa)
    `(comint-highlight-prompt
      ((t :foreground ,(syd-kanagawa-get 'old-white)
          :background unspecified
diff --git a/users/lain/default.nix b/users/lain/default.nix
index 491a354..1531a5e 100755
--- a/users/lain/default.nix
+++ b/users/lain/default.nix
@@ -19,14 +19,16 @@
       "$y$j9T$aEFDDwdTZbAc6VQRXrkBJ0$K8wxTGTWDihyX1wxJ.ZMH//wmQFfrGGUkLkxIU0Lyq8";
 
     openssh.authorizedKeys.keyFiles = [
-      ../../public-keys/crumb-at-guix-rebound.pub
-      ../../public-keys/crumble-at-fruitbook.pub
+      ../../public-keys/ssh/crumb-at-guix-rebound.pub
+      ../../public-keys/ssh/crumble-at-fruitbook.pub
+      ../../public-keys/ssh/crumb-at-nixos-testbed.pub
     ];
   };
 
   homeConfiguration = { config, lib, pkgs, ... }: {
     imports = [
       ../crumb/programs/nvim.nix
+      ./files.nix
     ];
 
     programs.bash.enable = true;
diff --git a/users/lain/files.nix b/users/lain/files.nix
new file mode 100644
index 0000000..41c54c9
--- /dev/null
+++ b/users/lain/files.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+let mutableSymlink = config.lib.file.mkOutOfStoreSymlink;
+in {
+  home.file.".ssh/id_ed25519".source =
+    mutableSymlink "/persist/private-keys/ssh/lain-at-deertopia";
+  home.file.".ssh/id_ed25519.pub".source =
+    ../../public-keys/ssh/lain-at-deertopia.pub;
+}