xd

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.

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)
 

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";
+        };
+      };
+    };
+  };
+}