sshAuthSock: fix naming scheme

modules/misc/ssh-auth-sock.nix

@@ -1,7 +1,7 @@
 { config, lib, ... }:
 
 let
-  cfg = config.ssh_auth_sock;
+  cfg = config.sshAuthSock;
 
   mkShellInitOption =
     shell:
@@ -44,7 +44,7 @@ in
 {
   meta.maintainers = [ lib.maintainers.bmrips ];
 
-  options.ssh_auth_sock.initialization = lib.mkOption {
+  options.sshAuthSock.initialization = lib.mkOption {
     description = ''
       Shell-specific code to initialize {env}`SSH_AUTH_SOCK`.
 

modules/modules.nix

@@ -48,7 +48,7 @@ let
       ./misc/qt/kvantum.nix
       ./misc/shell.nix
       ./misc/specialisation.nix
-      ./misc/ssh_auth_sock.nix
+      ./misc/ssh-auth-sock.nix
       ./misc/submodule-support.nix
       ./misc/tmpfiles.nix
       ./misc/uninstall.nix

modules/services/gpg-agent.nix

@@ -366,7 +366,7 @@ in
       ++ [ cfg.extraConfig ]
     );
 
-    ssh_auth_sock.initialization = lib.mkIf cfg.enableSshSupport {
+    sshAuthSock.initialization = lib.mkIf cfg.enableSshSupport {
       bash = ''
         unset SSH_AGENT_PID
         if [ "''${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then

modules/services/proton-pass-agent.nix

@@ -74,7 +74,7 @@ in
     lib.mkIf cfg.enable {
       home.packages = [ cfg.package ];
 
-      ssh_auth_sock.initialization = {
+      sshAuthSock.initialization = {
         bash = ''export SSH_AUTH_SOCK="${socketPath}"'';
         fish = ''set -x SSH_AUTH_SOCK "${socketPath}"'';
         nushell = "$env.SSH_AUTH_SOCK = ${

modules/services/ssh-agent.nix

@@ -60,7 +60,7 @@ in
 
   config = lib.mkIf cfg.enable {
 
-    ssh_auth_sock.initialization =
+    sshAuthSock.initialization =
       let
         socketPath =
           if pkgs.stdenv.isDarwin then

modules/services/ssh-tpm-agent.nix

@@ -63,7 +63,7 @@ in
 
     # Override ssh-agent's $SSH_AUTH_SOCK definition since ssh-tpm-agent is a
     # proxy to it.
-    ssh_auth_sock.initialization = lib.mkOverride 90 {
+    sshAuthSock.initialization = lib.mkOverride 90 {
       bash = ''export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-tpm-agent.sock"'';
       fish = ''set -x SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/ssh-tpm-agent.sock"'';
       nushell = ''$env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/ssh-tpm-agent.sock"'';

modules/services/yubikey-agent.nix

@@ -22,7 +22,7 @@ in
   config = mkIf cfg.enable {
     home.packages = [ cfg.package ];
 
-    ssh_auth_sock.initialization =
+    sshAuthSock.initialization =
       let
         socketPath =
           if pkgs.stdenv.isDarwin then

tests/default.nix

@@ -187,7 +187,7 @@ import nmtSrc {
           ./modules/misc/nix
           ./modules/misc/nix-remote-build
           ./modules/misc/specialisation
-          ./modules/misc/ssh_auth_sock/default.nix
+          ./modules/misc/ssh-auth-sock/default.nix
           ./modules/misc/xdg
           ./modules/xresources
           # keep-sorted end

tests/modules/misc/ssh-auth-sock/default.nix

@@ -0,0 +1,4 @@
+{
+  sshAuthSock-conflicts = ./conflicts.nix;
+  sshAuthSock-initialization = ./initialization.nix;
+}

tests/modules/misc/ssh-auth-sock/initialization.nix

@@ -4,7 +4,7 @@
   programs.nushell.enable = true;
   programs.zsh.enable = true;
 
-  ssh_auth_sock.initialization = {
+  sshAuthSock.initialization = {
     bash = "echo bash/zsh";
     fish = "echo fish";
     nushell = "echo nushell";

tests/modules/misc/ssh_auth_sock/default.nix

@@ -1,4 +0,0 @@
-{
-  ssh_auth_sock-conflicts = ./conflicts.nix;
-  ssh_auth_sock-initialization = ./initialization.nix;
-}

tests/modules/services/proton-pass-agent/default.nix

@@ -1,5 +1,5 @@
 {
   proton-pass-agent-basic-service = ./basic-service.nix;
   proton-pass-agent-full-service = ./full-service.nix;
-  proton-pass-agent-ssh_auth_sock = ./ssh_auth_sock.nix;
+  proton-pass-agent-sshAuthSock = ./ssh-auth-sock.nix;
 }

tests/modules/services/ssh-agent/darwin/default.nix

@@ -1,6 +1,6 @@
 {
   ssh-agent-basic-service = ./basic-service.nix;
   ssh-agent-pkcs11-service = ./pkcs11-service.nix;
-  ssh-agent-ssh_auth_sock = ./ssh_auth_sock.nix;
+  ssh-agent-sshAuthSock = ./ssh-auth-sock.nix;
   ssh-agent-timeout-service = ./timeout-service.nix;
 }

tests/modules/services/ssh-agent/linux/default.nix

@@ -1,6 +1,6 @@
 {
   ssh-agent-basic-service = ./basic-service.nix;
   ssh-agent-pkcs11-service = ./pkcs11-service.nix;
-  ssh-agent-ssh_auth_sock = ./ssh_auth_sock.nix;
+  ssh-agent-sshAuthSock = ./ssh-auth-sock.nix;
   ssh-agent-timeout-service = ./timeout-service.nix;
 }

tests/modules/services/ssh-tpm-agent/default.nix

@@ -2,6 +2,6 @@
 
 lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
   ssh-tpm-agent-as-ssh-agent-proxy = ./as-ssh-agent-proxy.nix;
-  ssh-tpm-agent-ssh_auth_sock = ./ssh_auth_sock.nix;
+  ssh-tpm-agent-sshAuthSock = ./ssh-auth-sock.nix;
   ssh-tpm-agent-standalone = ./standalone.nix;
 }

tests/modules/services/yubikey-agent/darwin/default.nix

@@ -1,4 +1,4 @@
 {
   yubikey-agent-service = ./service.nix;
-  yubikey-agent-ssh_auth_sock = ./ssh_auth_sock.nix;
+  yubikey-agent-sshAuthSock = ./ssh-auth-sock.nix;
 }

tests/modules/services/yubikey-agent/linux/default.nix

@@ -1,4 +1,4 @@
 {
   yubikey-agent-service = ./service.nix;
-  yubikey-agent-ssh_auth_sock = ./ssh_auth_sock.nix;
+  yubikey-agent-sshAuthSock = ./ssh-auth-sock.nix;
 }