Merge branch 'master' of ssh://git.fudo.org:2222/fudosys/NixOS

defaults.nix

@@ -142,6 +142,7 @@
     openssh = {
       enable = true;
       startWhenNeeded = true;
+      permitRootLogin = "prohibit-password";
       extraConfig = ''
         GSSAPIAuthentication yes
         GSSAPICleanupCredentials yes
@@ -164,12 +165,13 @@
 
   security.pam = {
     # TODO: add yubico?
-    services.sshd = {
-      # This should only ask for a code if ~/.google_authenticator exists, but it asks anyway.
-      # googleAuthenticator.enable = true;
-      makeHomeDir = true;
-      # Fails!
-      # requireWheel = true;
+    services = {
+      sshd = {
+        # This should only ask for a code if ~/.google_authenticator exists, but it asks anyway.
+        # googleAuthenticator.enable = true;
+        makeHomeDir = true;
+        sshAgentAuth = true;
+      };
     };
   };