diff --git a/tests/modules/services/proton-pass-agent/bash-integration.nix b/tests/modules/services/proton-pass-agent/bash-integration.nix index 7f30cccb..bf5bbc9f 100644 --- a/tests/modules/services/proton-pass-agent/bash-integration.nix +++ b/tests/modules/services/proton-pass-agent/bash-integration.nix @@ -15,7 +15,7 @@ assertFileContains $bash_profile \ 'export SSH_AUTH_SOCK=${ if pkgs.stdenv.hostPlatform.isDarwin then - "$(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)" + "$(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)" else "$XDG_RUNTIME_DIR" }/proton-pass-agent' diff --git a/tests/modules/services/proton-pass-agent/basic-service-expected.plist b/tests/modules/services/proton-pass-agent/basic-service-expected.plist index e8f71a8c..c769f7cd 100644 --- a/tests/modules/services/proton-pass-agent/basic-service-expected.plist +++ b/tests/modules/services/proton-pass-agent/basic-service-expected.plist @@ -17,7 +17,7 @@ /bin/sh -c - /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@proton-pass-cli@/bin/pass-cli ssh-agent start --socket-path $(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/proton-pass-agent/socket' + /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@proton-pass-cli@/bin/pass-cli ssh-agent start --socket-path $(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/proton-pass-agent/socket' RunAtLoad diff --git a/tests/modules/services/proton-pass-agent/fish-integration.nix b/tests/modules/services/proton-pass-agent/fish-integration.nix index b22066ef..18d93f40 100644 --- a/tests/modules/services/proton-pass-agent/fish-integration.nix +++ b/tests/modules/services/proton-pass-agent/fish-integration.nix @@ -15,7 +15,7 @@ assertFileContains $fish_config \ 'set -x SSH_AUTH_SOCK ${ if pkgs.stdenv.hostPlatform.isDarwin then - "$(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)" + "$(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)" else "$XDG_RUNTIME_DIR" }/proton-pass-agent' diff --git a/tests/modules/services/proton-pass-agent/full-service-expected.plist b/tests/modules/services/proton-pass-agent/full-service-expected.plist index aa462e83..6a0c7426 100644 --- a/tests/modules/services/proton-pass-agent/full-service-expected.plist +++ b/tests/modules/services/proton-pass-agent/full-service-expected.plist @@ -17,7 +17,7 @@ /bin/sh -c - /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@proton-pass-cli@/bin/pass-cli ssh-agent start --socket-path $(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/proton-pass-agent/socket --share-id 123456789 --vault-name MySshKeyVault --refresh-interval 7200 --create-new-identities MySshKeyVault' + /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@proton-pass-cli@/bin/pass-cli ssh-agent start --socket-path $(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/proton-pass-agent/socket --share-id 123456789 --vault-name MySshKeyVault --refresh-interval 7200 --create-new-identities MySshKeyVault' RunAtLoad diff --git a/tests/modules/services/proton-pass-agent/nushell-integration.nix b/tests/modules/services/proton-pass-agent/nushell-integration.nix index 19dd2873..37271983 100644 --- a/tests/modules/services/proton-pass-agent/nushell-integration.nix +++ b/tests/modules/services/proton-pass-agent/nushell-integration.nix @@ -19,7 +19,7 @@ assertFileContains $nu_config \ '$env.SSH_AUTH_SOCK = $"${ if pkgs.stdenv.hostPlatform.isDarwin then - "(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)" + "(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)" else "($env.XDG_RUNTIME_DIR)" }/proton-pass-agent"' diff --git a/tests/modules/services/ssh-agent/darwin/bash-integration.nix b/tests/modules/services/ssh-agent/darwin/bash-integration.nix index 2341462a..b46a20e1 100644 --- a/tests/modules/services/ssh-agent/darwin/bash-integration.nix +++ b/tests/modules/services/ssh-agent/darwin/bash-integration.nix @@ -9,6 +9,6 @@ nmt.script = '' assertFileContains \ home-files/.profile \ - 'export SSH_AUTH_SOCK=$(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent' + 'export SSH_AUTH_SOCK=$(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent' ''; } diff --git a/tests/modules/services/ssh-agent/darwin/basic-service-expected.plist b/tests/modules/services/ssh-agent/darwin/basic-service-expected.plist index 6c8d8d2c..8a44b3ce 100644 --- a/tests/modules/services/ssh-agent/darwin/basic-service-expected.plist +++ b/tests/modules/services/ssh-agent/darwin/basic-service-expected.plist @@ -17,7 +17,7 @@ /bin/sh -c - /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@openssh@/bin/ssh-agent -D -a "$(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent"' + /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@openssh@/bin/ssh-agent -D -a "$(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent"' RunAtLoad diff --git a/tests/modules/services/ssh-agent/darwin/nushell-integration.nix b/tests/modules/services/ssh-agent/darwin/nushell-integration.nix index 40c531ae..0bc4c444 100644 --- a/tests/modules/services/ssh-agent/darwin/nushell-integration.nix +++ b/tests/modules/services/ssh-agent/darwin/nushell-integration.nix @@ -9,6 +9,6 @@ nmt.script = '' assertFileContains \ home-files/.config/nushell/config.nu \ - '$env.SSH_AUTH_SOCK = $"(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent"' + '$env.SSH_AUTH_SOCK = $"(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent"' ''; } diff --git a/tests/modules/services/ssh-agent/darwin/pkcs11-service-expected.plist b/tests/modules/services/ssh-agent/darwin/pkcs11-service-expected.plist index 72139397..a660ba35 100644 --- a/tests/modules/services/ssh-agent/darwin/pkcs11-service-expected.plist +++ b/tests/modules/services/ssh-agent/darwin/pkcs11-service-expected.plist @@ -17,7 +17,7 @@ /bin/sh -c - /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@openssh@/bin/ssh-agent -D -a "$(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent" -P '\''/usr/lib/libpkcs11.so,/usr/lib/other.so'\''' + /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@openssh@/bin/ssh-agent -D -a "$(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent" -P '\''/usr/lib/libpkcs11.so,/usr/lib/other.so'\''' RunAtLoad diff --git a/tests/modules/services/ssh-agent/darwin/timeout-service-expected.plist b/tests/modules/services/ssh-agent/darwin/timeout-service-expected.plist index 6facee27..6442e73c 100644 --- a/tests/modules/services/ssh-agent/darwin/timeout-service-expected.plist +++ b/tests/modules/services/ssh-agent/darwin/timeout-service-expected.plist @@ -17,7 +17,7 @@ /bin/sh -c - /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@openssh@/bin/ssh-agent -D -a "$(@getconf-system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent" -t 1337' + /bin/wait4path /nix/store && exec @bash-interactive@/bin/bash -c '@openssh@/bin/ssh-agent -D -a "$(@system_cmds@/bin/getconf DARWIN_USER_TEMP_DIR)/ssh-agent" -t 1337' RunAtLoad