1 files changed, 21 insertions, 14 deletions

diff --git a/accounts/gkleen@skadhi/ssh/default.nix b/accounts/gkleen@skadhi/ssh/default.nix
index f0fd93a8..ab0e8990 100644
--- a/accounts/gkleen@skadhi/ssh/default.nix
+++ b/accounts/gkleen@skadhi/ssh/default.nix
@@ -5,33 +5,40 @@
       ".ssh"
     ];
 
-    programs.ssh.matchBlocks = {
+    programs.ssh.settings = {
       "surtr" = {
-        hostname = "surtr.yggdrasil";
-        identityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
+        Hostname = "surtr.yggdrasil";
+        IdentityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
       };
       "surtr.yggdrasil.li" = {
-        identityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
+        IdentityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
       };
       "sif" = {
-        hostname = "sif.yggdrasil";
-        identityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
+        Hostname = "sif.yggdrasil";
+        IdentityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
       };
       "vidhar" = {
-        hostname = "vidhar.yggdrasil";
-        identityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
+        Hostname = "vidhar.yggdrasil";
+        IdentityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
       };
       "ymir" = {
-        hostname = "ymir.yggdrasil.li";
-        identityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
+        Hostname = "ymir.yggdrasil.li";
+        IdentityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
       };
-      ${lib.concatStringsSep " " [".host" "skadhi" "skadhi.yggdrasil" "localhost" "::1" "127.0.0.0/8"]} = {
-        identityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
+      "localhost" = {
+        header = "Host " + lib.concatStringsSep " " [".host" "skadhi" "skadhi.yggdrasil" "localhost" "::1" "127.0.0.0/8"];
+        IdentityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
       };
       "git.yggdrasil.li" = {
-        user = "gitolite";
-        identityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
+        User = "gitolite";
+        IdentityFile = "~/.ssh/gkleen@skadhi.yggdrasil";
+      };
+      "github.com" = {
+        User = "git";
+        IdentityFile = "~/.ssh/gkleen@github.com";
       };
     };
+
+    programs.ssh.autosshProxies.vidhar.port = 8121;
   };
 }