diff --git a/home-manager/sajenim/features/cli/default.nix b/home-manager/sajenim/features/cli/default.nix
index 9b2a39f..e19802d 100644
--- a/home-manager/sajenim/features/cli/default.nix
+++ b/home-manager/sajenim/features/cli/default.nix
@@ -7,16 +7,30 @@
 
   programs.ssh = {
     enable = true;
-    matchBlocks."viridian" = {
-      hostname = "viridian.home.arpa";
-      identityFile = "/home/sajenim/.ssh/sajenim_sk";
-      port = 22;
-    };
+    matchBlocks = {
+      "viridian" = {
+        hostname = "viridian.home.arpa";
+        user = "sajenim";
+        identityFile = "/home/sajenim/.ssh/sajenim_sk";
+      };
 
-    matchBlocks."lavender" = {
-      hostname = "lavender.home.arpa";
-      identityFile = "/home/sajenim/.ssh/sajenim_sk";
-      port = 22;
+      "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/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";
     };