Merge branch 'de_test'

modules/ssh.nix

@@ -3,47 +3,7 @@
     enable = true;
     compression = true;
     matchBlocks = {
-      "gitlab.com" = {
-        hostname = "gitlab.com";
-        identityFile = "~/.ssh/gitlab";
-        identitiesOnly = true;
-      };
-      "github.com" = {
-        hostname = "github.com";
-        identityFile = "~/.ssh/github";
-        identitiesOnly = true;
-      };
-      "bitbucket.com" = {
-        hostname = "bitbucket.com";
-        identityFile = "~/.ssh/bitbucket";
-        identitiesOnly = true;
-      };
-      "aur.archlinux.org" = {
-        hostname = "aur.archlinux.org";
-        identityFile = "~/.ssh/aur";
-        identitiesOnly = true;
-      };
-      "heroku.com" = {
-        hostname = "heroku.com";
-        identityFile = "~/.ssh/heroku";
-        identitiesOnly = true;
-      };
-      "ngrok.io" = {
-        hostname = "ngrok.io";
-        identityFile = "~/.ssh/local";
-        identitiesOnly = true;
-      };
-      "*.local 172.27.108.*" = {
-        identityFile = "~/.ssh/local";
-        identitiesOnly = true;
-      };
-      "*.moon-cloud.eu moon-cloud.eu 172.20.28.*" = {
-        identityFile = "~/.ssh/moon-cloud";
-        identitiesOnly = true;
-      };
-      "*" = {
-        identityFile = "~/.ssh/id_ed25519";
-      };
+      "*" = { identityFile = "~/.ssh/id_ed25519"; };
     };
   };
 }

nixos/thor.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
   imports = [
     <nixos-hardware/common/cpu/amd>