From bc3e16b45c0d5311e8da1fb915a93063f69cca7e Mon Sep 17 00:00:00 2001
From: Szymon P <szymon_jozef@proton.me>
Date: Fri, 20 Feb 2026 01:24:18 +0100
Subject: [PATCH] xd

---
 home.nix         |  1 +
 modules/fish.nix |  4 ----
 modules/ssh.nix  | 31 +++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 modules/ssh.nix

diff --git a/home.nix b/home.nix
index 0b34faf..87bd2c9 100644
--- a/home.nix
+++ b/home.nix
@@ -22,6 +22,7 @@
     ./modules/atuin.nix
     ./modules/zoxide.nix
     ./modules/mako.nix
+    ./modules/ssh.nix
   ];
 
   home.stateVersion = "25.11"; # Please read the comment before changing.
diff --git a/modules/fish.nix b/modules/fish.nix
index ec0737f..94035df 100644
--- a/modules/fish.nix
+++ b/modules/fish.nix
@@ -15,10 +15,6 @@
       # yes, please setup git for me
       gh auth setup-git
 
-      # add github ssh key
-      eval (ssh-agent -c) > /dev/null
-      ssh-add ~/.ssh/github 2> /dev/null
-
       # add github gpg key
       set -gx GPG_TTY (tty)
 
diff --git a/modules/ssh.nix b/modules/ssh.nix
new file mode 100644
index 0000000..4645ef1
--- /dev/null
+++ b/modules/ssh.nix
@@ -0,0 +1,31 @@
+{ args, ... }:
+
+{
+  services.ssh-agent.enable = true;
+  services.ssh-agent.enableFishIntegration = true;
+
+  programs.ssh = {
+    enableDefaultConfig = false;
+    enable = true;
+    matchBlocks = {
+      "dmowski" = {
+        hostname = "192.168.0.30";
+        user = "szymon";
+        port = 22;
+        identityFile = "~/.ssh/dmowski";
+      };
+
+      "aur.archlinux.org" = {
+        user = "szymon";
+        identityFile = "~/.ssh/aur";
+      };
+
+      "*" = {
+        addKeysToAgent = "yes";
+        setEnv = {
+          TERM = "xterm-256color";
+        };
+      };
+    };
+  };
+}