From aee7e2f6d1aaee4a3e6112cb25dd531ccf2d54bd Mon Sep 17 00:00:00 2001
From: BuyMyMojo <hello+git@buymymojo.net>
Date: Wed, 2 Apr 2025 11:18:50 +1100
Subject: [PATCH] Update git config

---
 nixos/flake.lock                           |  4 ++--
 nixos/home-manager/low-power-laptop.nix    |  6 ++++++
 nixos/home-manager/nixos.nix               |  6 ++++++
 nixos/home-manager/packages/common-cli.nix | 22 ++++++++++++++++++----
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/nixos/flake.lock b/nixos/flake.lock
index 18959ab..51cd8b3 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -327,11 +327,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-rADqSJu492bURPi5fmvPyeG1B5bV3k2hfGR+VfHn1Ig=",
-        "path": "/nix/store/x6r1qh9vy8k22l9jiyx250qxnmrz57z2-source/nixos/programs/shadps4",
+        "path": "/nix/store/8yv77m1p7y4byxi78s4m3xww3023fvqj-source/nixos/programs/shadps4",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/x6r1qh9vy8k22l9jiyx250qxnmrz57z2-source/nixos/programs/shadps4",
+        "path": "/nix/store/8yv77m1p7y4byxi78s4m3xww3023fvqj-source/nixos/programs/shadps4",
         "type": "path"
       }
     },
diff --git a/nixos/home-manager/low-power-laptop.nix b/nixos/home-manager/low-power-laptop.nix
index 84987e8..fda612c 100644
--- a/nixos/home-manager/low-power-laptop.nix
+++ b/nixos/home-manager/low-power-laptop.nix
@@ -77,6 +77,12 @@
     EDITOR = "nvim";
   };
 
+  programs.ssh.matchBlocks = {
+    "*" = {
+      identityFile = "/home/buymymojo/.ssh/id_ed25519";
+    };
+  };
+
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }
diff --git a/nixos/home-manager/nixos.nix b/nixos/home-manager/nixos.nix
index 581b909..878b808 100644
--- a/nixos/home-manager/nixos.nix
+++ b/nixos/home-manager/nixos.nix
@@ -76,6 +76,12 @@
     signing.key = "E7B7B8D20C8753C077F9B17119AB7AA462B8AB3B";
   };
 
+  programs.ssh.matchBlocks = {
+    "*" = {
+      identityFile = "/home/buymymojo/.ssh/id_ed25519-mainpc";
+    };
+  };
+
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }
diff --git a/nixos/home-manager/packages/common-cli.nix b/nixos/home-manager/packages/common-cli.nix
index 205af32..fffbc82 100644
--- a/nixos/home-manager/packages/common-cli.nix
+++ b/nixos/home-manager/packages/common-cli.nix
@@ -65,14 +65,28 @@ in
     };
   };
 
-  # programs.bellado = {
-  #   enable = true;
-  #   enableAliases = true;
-  # };
+  programs.bellado = {
+    enable = true;
+    enableAliases = true;
+  };
 
   programs.ssh.enable = true;
   programs.ssh.addKeysToAgent = "yes";
 
+  # === ssh ===
+  programs.ssh.matchBlocks = {
+    "game2.buymymojo.net" = {
+      hostname = "game2.buymymojo.net";
+      user = "jumpbox";
+    };
+
+    "git.aria.coffee" = {
+      hostname = "git.aria.coffee";
+      user = "git";
+      port = 23;
+    };
+  };
+
   # === shells ===
   programs.bash.enable = true;
   programs.fish.enable = true;