Move SSH config to network

config.nix

@@ -65,13 +65,6 @@ in {
     ];
   };
 
-  programs.ssh = {
-    startAgent = true;
-    agentTimeout = "10m";
-    knownHosts = [];
-  };
-  services.openssh.forwardX11 = true;
-
   programs.tmux = {
     enable = true;
     extraTmuxConf = import dot/tmux.nix;
@@ -98,11 +91,6 @@ in {
       ignores = config.constants.ignore;
     };
 
-    programs.ssh = {
-      enable = true;
-      matchBlocks = import dot/ssh.nix { inherit lib; };
-    };
-
     home.file = {
       ".config/mpv/input.conf".text = import dot/mpv.nix;
       ".config/Typora/themes/base.user.css".text = import dot/typora.nix;

configs/graphics.nix

@@ -18,7 +18,6 @@
       ${pkgs.feh}/bin/feh --bg-fill $(find ${../art} -type f | shuf -n 1) &
       ${pkgs.dropbox-cli}/bin/dropbox start &
       ${pkgs.seafile-client}/bin/seafile-applet &
-      ${pkgs.openssh}/bin/ssh-add
     '';
     displayManager.lightdm.greeters.gtk = {
       enable = true;

configs/networks.nix

@@ -26,8 +26,20 @@
       enable = true;
       indicator = true;
     };
+
+    programs.ssh = {
+      enable = true;
+      matchBlocks = {};
+    };
   };
 
+  programs.ssh = {
+    startAgent = true;
+    agentTimeout = "10m";
+    knownHosts = [];
+  };
+  services.openssh.forwardX11 = true;
+
   networking.retiolum = {
     scardanelli = {
       ipv4 = "10.243.2.2";

dot/ssh.nix

@@ -1,10 +0,0 @@
-{ lib }:
-with lib;
-let huServer = name: {
-  "${name}" = {
-    hostname = "${name}.informatik.hu-berlin.de";
-    user = (import ../secrets.nix).eduroam.identity;
-    identityFile = "~/.ssh/hu";
-  };
-};
-in lists.foldr (x: xs: huServer x // xs) {} [ "rabe" "star" "gruenau" "gruenau1" "gruenau2" "gruenau3" "gruenau4" "gruenau5" "gruenau6" "gruenau7" "gruenau8" ]