Revert commits after 089e185bd8

modules/applications/ssh/default.nix

@@ -3,7 +3,6 @@
   config,
   ...
 }:
-
 let
   cfg = config.my.applications.ssh;
 in
@@ -14,71 +13,33 @@ in
   ];
 
   options.my.applications.ssh = {
-    enable = lib.mkEnableOption "OpenSSH client and agent configuration";
+    enable = lib.mkEnableOption "OpenSSH client";
 
-    defaultIdentityFiles = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [
-        "~/.ssh/id_ed25519"
-      ];
-      description = ''
-        Default local SSH identity files.
-
-        These are used as the normal fallback identities when no agent key
-        is accepted, or when no forwarded agent is available.
-      '';
-    };
-
-    fidoIdentityFile = lib.mkOption {
+    defaultIdentityFile = lib.mkOption {
       type = lib.types.str;
-      default = "~/.ssh/id_ed25519_sk_rk";
-      description = ''
-        Local FIDO2 resident-key SSH identity handle.
-
-        This file is only added to SSH identity candidates when a FIDO2
-        device is actually visible. Do not use file existence to decide
-        whether this key is usable.
-      '';
-    };
-
-    githubIdentityFiles = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-      description = ''
-        Extra GitHub-specific SSH identity files.
-
-        Leave this empty if GitHub should use the normal agent, FIDO key,
-        and default identity fallback order.
-      '';
+      default = "~/.ssh/id_ed25519";
+      description = "Default SSH identity file";
     };
 
     addKeysToAgent = lib.mkOption {
       type = lib.types.str;
       default = "no";
-      example = "1h";
-      description = ''
-        Value for OpenSSH AddKeysToAgent.
-
-        Recommended default is "no" for this setup, because FIDO resident-key
-        handle files should not be added to the agent accidentally.
-      '';
+      description = "Add keys to SSH agent";
     };
 
     matchBlocks = lib.mkOption {
-      type = lib.types.attrsOf lib.types.anything;
+      type = lib.types.attrs;
       default = { };
-      description = ''
-        Additional Home Manager OpenSSH settings blocks.
+      description = "SSH match blocks";
+    };
 
-        Use this for host-specific options such as ForwardAgent = true.
-      '';
-      example = lib.literalExpression ''
-        {
-          "proxmox-* *.home.arpa *.internal" = {
-            ForwardAgent = true;
-          };
-        }
-      '';
+    githubIdentityFiles = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [
+        "~/.ssh/id_ed25519_sk_rk"
+        "~/.ssh/id_ed25519"
+      ];
+      description = "SSH identity files for GitHub (tried in order)";
     };
   };