flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717104796,
+        "lastModified": 1716892732,
-        "narHash": "sha256-6hJbR3t2qZi/ozZpfTB9eZRuE5BxtNOR9pTxEm7bYbY=",
+        "narHash": "sha256-n1UnQ7RbJwDAUX1fq4+hUNVVIWDlZKvAsUp/muSkV3g=",
         "owner": "dagger",
         "repo": "nix",
-        "rev": "b806c06b83310040821771278fc5bcd745c8934a",
+        "rev": "9e26b2f73eebf9e3b9fbc1a31c378ccb2daf84cd",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717525419,
+        "lastModified": 1716908526,
-        "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
+        "narHash": "sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
+        "rev": "373ead20606efa9181cd15ba19a5deac7ead1492",
         "type": "github"
       },
       "original": {
@@ -214,11 +214,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717297675,
+        "lastModified": 1716772633,
-        "narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=",
+        "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9",
+        "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac",
         "type": "github"
       },
       "original": {
@@ -303,11 +303,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1717196966,
+        "lastModified": 1716509168,
-        "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
+        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
+        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
         "type": "github"
       },
       "original": {

home-manager/modules/machine.nix

@@ -29,7 +29,6 @@ with lib;
     ./../programs/syncthing.nix
     ./../programs/hstr.nix
     ./../programs/thefuck.nix
-    ./../programs/ssh.nix
     ./../../nix.nix
     ./packages.nix
   ];
@@ -85,6 +84,10 @@ with lib;
         ".config/nano/nanorc".text = ''
           set linenumbers
         '';
+        ".ssh/config_source" = {
+          source = ./../dotfiles/ssh-config;
+          onChange = "cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config";
+        };
         ".gitignore".source = ./../dotfiles/.gitignore;
         ".config/pipewire/pipewire.conf.d/99-noise-suppression.conf".text = ''
           context.modules = [{

home-manager/programs/ssh.nix

@@ -1,91 +0,0 @@
-{ lib, ... }:
-
-let
-  ownDomains = [
-    "thilo-billerbeck.com"
-    "avocadoom.de"
-    "officerent.de"
-  ];
-  thiloBillerbeckHosts = [
-    "lisa"
-    "bart"
-    "burns"
-    "homer"
-    "marge"
-    "apu"
-    "krusty"
-    "skinner"
-  ];
-  manualMatchBlocks = {
-    "github.com" = {
-      identityFile = "~/.ssh/id_github-com";
-      user = "git";
-      identitiesOnly = true;
-    };
-    "mail" = { hostname = "mail.officerent.de"; };
-    "*.tu-darmstadt.de" = {
-      identityFile = "~/.ssh/id_tu-darmstadt-de";
-    };
-    "*.rwth-aachen.de" = {
-      identityFile = "~/.ssh/id_tu-darmstadt-de";
-    };
-    "*.tobias-neidig.de" = {
-      identityFile = "~/.ssh/id_tobias-neidig-de";
-    };
-    "*.darmstadt.ccc.de" = {
-      identityFile = "~/.ssh/id_darmstadt-ccc-de";
-    };
-    "*.relaix.net" = {
-      identityFile = "~/.ssh/id_relaix-net";
-      user = "tbillerbeck";
-    };
-    "*.w17.io" = {
-      user = "chaos";
-      identityFile = "~/.ssh/id_w17";
-    };
-    "*.tailscale.net" = {
-      user = "thilo";
-      identityFile = "~/.ssh/id_tailscale";
-    };
-    "ssh.dev.azure.com" = {
-      identityFile = "~/.ssh/id_azure-com";
-      identitiesOnly = true;
-      extraOptions = {
-        HostkeyAlgorithms = "+ssh-rsa";
-        PubkeyAcceptedKeyTypes = "+ssh-rsa";
-      };
-    };
-  };
-  catchAlls = builtins.listToAttrs (
-    builtins.map (host: {
-      name = "*.${host}";
-      value = {
-        identityFile = "~/.ssh/id_thilo-billerbeck-com";
-        user = "root";
-      };
-    }) ownDomains
-  );
-  hostnameAliasses = builtins.listToAttrs (
-    builtins.map (host: {
-      name = "${host}";
-      value = {
-        hostname = "${host}.thilo-billerbeck.com";
-      };
-    }) thiloBillerbeckHosts
-  );
-  buildersCCCDA = builtins.listToAttrs (
-    builtins.map (host: {
-      name = "build${host}.darmstadt.ccc.de";
-      value = {
-        	user = "avocadoom";
-          identityFile = "~/.ssh/id_darmstadt-ccc-de";
-      };
-    }) ["1" "2" "3" "4"]
-  );
-in
-{
-  programs.ssh = {
-    enable = true;
-    matchBlocks = manualMatchBlocks // catchAlls // hostnameAliasses // buildersCCCDA;
-  };
-}