fixing ssh and fireqos

nixos/configs/pepe/configuration.nix

@@ -50,7 +50,7 @@
 
   # nix-shell -p speedtest_cli --run speedtest
   configuration.fireqos = {
-    enable = true;
+    enable = false;
     interface = "enp0s25";
     input = 200000;
     output = 2000;

nixos/configs/robi/packages.nix

@@ -3,5 +3,6 @@
     mosh
     mediainfo
     youtube-dl
+    ipset # for sshguard
   ];
 }

nixos/system/all/sshd-known-hosts-private.nix

@@ -4,8 +4,10 @@
   services.openssh.knownHosts = {
     "robi" = {
       hostNames = [
+        "robi.private"
         "robi"
         "144.76.13.147"
+        "git.ingolf-wagner.de"
       ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2PGX6cZuBUGX4VweMzi0aRh4uQ61yngCzZGcK3w5XV";
     };
@@ -25,14 +27,6 @@
       ];
       publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyHmHJy2Va45p9mn+Hj3DyaY5yxnQIKvXeACHjzgSKt";
     };
-    "workout.private" = {
-      hostNames = [
-        "workout.private"
-        "workout.lan"
-        config.module.cluster.services.tinc.private.hosts.workout.tincIp
-      ];
-      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICjotuQJHDaL0fPY7yA2dIBVWRYOkp7/ablY60psMQ6w";
-    };
     "sputnik.private" = {
       hostNames = [
         "sputnik.private"
@@ -78,10 +72,5 @@
       publicKey =
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGhBtcipW9rV6hHS2hv5tl5hd8vW8dnuFfFwnAs2u0kS";
     };
-    "cracksucht.de" = {
-      hostNames = [ "cracksucht.de" ];
-      publicKey =
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVqpWzX+C7veO/1MDSdh5ukFhpI4cfXevbl6DVb9gVt1wdYB0JsiMiWfl13MZJy9iEP/KfwRLYmu8i36tDR9uJfHQyLK8G7q2DhrleIPgM3dFCdDU1QtulE8hEq/ZsqzMn/QIHYIipIqzNfmC/xnpX2gIo09T7EY+n863ALlj+GqxMb4nr2XDLY+Lllo2yMzylJIz9q8U5hOmzrlCnBpf2MPMwanHXnZXj2CmO80VyBHnAMJ/h72AN1qzDaHFlhxh0Li/POc1bpDjiVjiUPgimHZWpi3VObxWLLn2zf+RH2lx0yXMccSEnkWvHp+Ll5apIUUS+vTlDo3niWpEfGZLl root@debian";
-    };
   };
 }

nixos/system/all/sshd-known-hosts-public.nix

@@ -80,11 +80,6 @@ with lib;
       publicKey =
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmIOTjQsD1TaD9MiECcRqwfAXfRdbI+2pkuF+zhBUkrX41NA4LzifPY4Iw3PlklE0YGIOzYyNitzkdgxIWkeqa0Y9iL3gGZBuLFORj5YXWlDKB2RrPAsZRL8y69y4H6RWPpL6DHHsf9eT+HgRzWzzn5nUFLfkCsuM96BqjIKN1pinIBcE6gst1UUSwSTjK8XZA5d4BiSrLF4HiNXnDm+qniYGbGkzZcjn1ua+l0GdGbfg9TotFnSK/QXgN3MeHHDZKnIjOIkOXCY+L5URe0RHo6pBFdj+BLr211AJhB52MrDNudQcY6eSQiJ08LeE6SkcrsQO/VZ/JnOkHxHd2mOyH";
     };
-    "git.ingolf-wagner.de" = {
-      hostNames = [ "[git.ingolf-wagner.de]:443" ];
-      publicKey =
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvJoz+6Ew0L518+jhue69hm0nEzVBuyUWDRUM3QnOQCCmGgFFXq+iTxgYoo2e3qYFUV0CmYK548ZKBB/nGUmrRwT06sJXtOCmVsBCMxBX6KNEBxKns8urQqWZ/ShzuKhpZmC9EuB25QVXCkUuc1aXtVgLng8Ucke/kOHE/HcwB4Sb7SCNP7pF4/mBpuH9cONs21HkxE6Aj85LSSJCRwiyL+WBEibDcDVy+W5hicAp/m7sL+sezFkNzru0X10G1kuC01+HZT8I5Be3xQ9llWkMkVaO5L7N9+SUXxZSMtwI9uEU8iPuXhb9ETyIR530kipydOljD6nA3hRC12nnE2T0d";
-    };
     "siteground" = {
       hostNames = [ "[es5.siteground.eu]:18765" "[37.60.224.6]:18765" ];
       publicKey =

nixos/system/desktop/home-manager/ssh.nix

@@ -4,74 +4,35 @@ with lib; {
   home-manager.users.mainUser = {
     programs.ssh.enable = true;
     programs.ssh.matchBlocks = {
-      "lassul.us" = {
+      "*" = {
         identityFile = "~/.ssh/card_rsa.pub";
         identitiesOnly = true;
+      };
+      "lassul.us" = {
         user = "download";
         port = 45621;
       };
       "*.r" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
         user = "root";
       };
       "*.secret" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
         user = "root";
       };
       "*.private" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
         user = "root";
       };
       "*.lan" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
         user = "root";
       };
-      "*.ingolf-wagner.de" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
-        extraOptions.HostKeyAlgorithms = "ssh-rsa";
-        user = "root";
-      };
-      "git.renoise.com" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
-        extraOptions.HostKeyAlgorithms = "ssh-rsa";
-      };
-      "*.renoise.com" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
-      };
-      "*.sononym.net" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
-      };
       "github.com" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
         hostname = "ssh.github.com";
         user = "root";
       };
       "es5.siteground.eu" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
         user = "ingolfwa";
         port = 18765;
       };
-      "bitbucket.org" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
-      };
-      "static.247.134.201.195.clients.your-server.de" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
-      };
       "*.onion" = {
-        identityFile = "~/.ssh/card_rsa.pub";
-        identitiesOnly = true;
         user = "root";
       };
     };