From b777814ff460dc44c6dbac020251efe38623fbc4 Mon Sep 17 00:00:00 2001
From: jasmine <its.jassy@pm.me>
Date: Sun, 16 Feb 2025 20:47:00 +0800
Subject: [PATCH] update ssh

---
 home-manager/sajenim/features/cli/default.nix | 16 +---------
 home-manager/sajenim/features/cli/git.nix     |  1 -
 home-manager/sajenim/features/cli/ssh.nix     | 30 +++++++++++++++++++
 home-manager/sajenim/p6p_biometric.pub        |  1 -
 nixos/common/users/sajenim/default.nix        |  1 -
 5 files changed, 31 insertions(+), 18 deletions(-)
 create mode 100644 home-manager/sajenim/features/cli/ssh.nix
 delete mode 100644 home-manager/sajenim/p6p_biometric.pub

diff --git a/home-manager/sajenim/features/cli/default.nix b/home-manager/sajenim/features/cli/default.nix
index 9b2a39f..1c08272 100644
--- a/home-manager/sajenim/features/cli/default.nix
+++ b/home-manager/sajenim/features/cli/default.nix
@@ -2,21 +2,7 @@
   imports = [
     ./git.nix
     ./nvim.nix
+    ./ssh.nix
     ./zsh.nix
   ];
-
-  programs.ssh = {
-    enable = true;
-    matchBlocks."viridian" = {
-      hostname = "viridian.home.arpa";
-      identityFile = "/home/sajenim/.ssh/sajenim_sk";
-      port = 22;
-    };
-
-    matchBlocks."lavender" = {
-      hostname = "lavender.home.arpa";
-      identityFile = "/home/sajenim/.ssh/sajenim_sk";
-      port = 22;
-    };
-  };
 }
diff --git a/home-manager/sajenim/features/cli/git.nix b/home-manager/sajenim/features/cli/git.nix
index 202344e..252b99d 100644
--- a/home-manager/sajenim/features/cli/git.nix
+++ b/home-manager/sajenim/features/cli/git.nix
@@ -5,7 +5,6 @@
     userEmail = "its.jassy@pm.me";
     extraConfig = {
       init.defaultBranch = "master";
-      core.sshCommand = "ssh -i ~/.ssh/forgejo_sk -F /dev/null";
       commit.gpgsign = "true";
       user.signingkey = "8563E358D4E8040E";
     };
diff --git a/home-manager/sajenim/features/cli/ssh.nix b/home-manager/sajenim/features/cli/ssh.nix
new file mode 100644
index 0000000..acb6ee1
--- /dev/null
+++ b/home-manager/sajenim/features/cli/ssh.nix
@@ -0,0 +1,30 @@
+{...}: {
+  programs.ssh = {
+    enable = true;
+    matchBlocks = {
+      "viridian" = {
+        hostname = "viridian.home.arpa";
+        user = "sajenim";
+        identityFile = "/home/sajenim/.ssh/sajenim_sk";
+      };
+
+      "lavender" = {
+        hostname = "lavender.home.arpa";
+        user = "sajenim";
+        identityFile = "/home/sajenim/.ssh/sajenim_sk";
+      };
+
+      "sajenim-github" = {
+        hostname = "github.com";
+        user = "git";
+        identityFile = "/home/sajenim/.ssh/sajenim-github_sk";
+      };
+
+      "jasmine-forgejo" = {
+        hostname = "git.sajenim.dev";
+        user = "forgejo";
+        identityFile = "/home/sajenim/.ssh/jasmine-forgejo_sk";
+      };
+    };
+  };
+}
diff --git a/home-manager/sajenim/p6p_biometric.pub b/home-manager/sajenim/p6p_biometric.pub
deleted file mode 100644
index 9d94c9c..0000000
--- a/home-manager/sajenim/p6p_biometric.pub
+++ /dev/null
@@ -1 +0,0 @@
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJC2zR9w3y+OXEq7qcs8dIdSC2j4LUx2197fyXwR3aSLHwypodiZTdJTJkmklxxaUXmyi7CZUmp1LPx5vdLPgzI=
diff --git a/nixos/common/users/sajenim/default.nix b/nixos/common/users/sajenim/default.nix
index 220490a..8c64250 100644
--- a/nixos/common/users/sajenim/default.nix
+++ b/nixos/common/users/sajenim/default.nix
@@ -15,7 +15,6 @@
     shell = pkgs.zsh;
     openssh.authorizedKeys.keyFiles = [
       "${inputs.self}/home-manager/sajenim/sajenim_sk.pub"
-      "${inputs.self}/home-manager/sajenim/p6p_biometric.pub"
     ];
     hashedPassword = "$y$j9T$qIhW5qL9J9w.w6JWa.bGo/$oddG3HJyOZ1mwHzYnYPJ/MzN38oHEBEvPDc0sB3rAf9";
   };