simplify ssh configuration

1 files changed, 8 insertions, 28 deletions

diff --git a/home/programs/ssh.nix b/home/programs/ssh.nix
index 77c4897..efc3085 100644
--- a/home/programs/ssh.nix
+++ b/home/programs/ssh.nix
@@ -5,60 +5,40 @@
     enableDefaultConfig = false;
     matchBlocks = {
       "*" = {
-        forwardAgent = true;
-        serverAliveInterval = 60;
-        controlPersist = "30m";
-        controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p";
         controlMaster = "auto";
+        controlPath = "${config.home.homeDirectory}/.ssh/sockets/S.%r@%h:%p";
+        controlPersist = "30m";
+        forwardAgent = false;
+        identitiesOnly = true;
+        identityAgent = "none";
+        identityFile = "${config.home.homeDirectory}/.ssh/id_ed25519_sk_rk";
+        serverAliveInterval = 60;
       };
-      "rivendell" = {
+      "riv" = {
         hostname = "192.168.1.114";
-        identityAgent = "none";
-        identitiesOnly = true;
-        identityFile = "~/.ssh/id_ed25519_sk_rk";
       };
       "riv-unlock" = {
         hostname = "192.168.1.114";
         user = "root";
         port = 911;
-        identityAgent = "none";
-        identitiesOnly = true;
-        identityFile = "~/.ssh/id_ed25519_sk_rk";
       };
       "nas" = {
         hostname = "192.168.1.68";
-        identityAgent = "none";
-        identitiesOnly = true;
-        identityFile = "~/.ssh/id_ed25519_sk_rk";
       };
       "nnas" = {
         hostname = "192.168.1.68";
         user = "nas";
-        identityAgent = "none";
-        identitiesOnly = true;
-        identityFile = "~/.ssh/id_ed25519_sk_rk";
       };
       "bree" = {
         hostname = "192.168.1.50";
-        identityAgent = "none";
-        identitiesOnly = true;
-        identityFile = "~/.ssh/id_ed25519_sk_rk";
       };
       "argonath" = {
         hostname = "fcuny.net";
-        identityAgent = "none";
-        identitiesOnly = true;
-        identityFile = "~/.ssh/id_ed25519_sk_rk";
       };
       "github.com" = {
         hostname = "github.com";
         user = "git";
-        forwardAgent = false;
-        identityAgent = "none";
-        identitiesOnly = true;
-        identityFile = "~/.ssh/id_ed25519_sk_rk";
         extraOptions = {
-          preferredAuthentications = "publickey";
           controlMaster = "no";
           controlPath = "none";
         };