Compare commits

...

6 Commits

Author SHA1 Message Date
Michael Strobel
82fb7dedaa sftpman: add missing options
- `authType` is missing the `authentication-agent` enum value
- `mountDestPath` is missing completely

(cherry picked from commit 3351348827)
2026-01-08 17:14:43 -05:00
home-manager-ci[bot]
8c8a16d413 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05)
  → 'github:NixOS/nixpkgs/d351d0653aeb7877273920cd3e823994e7579b0b?narHash=sha256-r4GVX%2BFToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE%3D' (2026-01-07)
2026-01-08 00:37:08 -05:00
home-manager-ci[bot]
c08430923e flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/64049ca74d63e971b627b5f3178d95642e61cedd?narHash=sha256-yA/CuWyqm%2BAQo2ivGy6PlYrjZBQm7jfbe461%2B4HF2fo%3D' (2026-01-02)
  → 'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05)
2026-01-07 11:02:15 +01:00
Robert Helgesson
6bd04da47c gpg: update key hash in test
Fixes #8478

(cherry picked from commit a65c04965c)
2026-01-05 14:31:40 +01:00
home-manager-ci[bot]
7a06e8a2f8 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/89dbf01df72eb5ebe3b24a86334b12c27d68016a?narHash=sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo%3D' (2025-12-29)
  → 'github:NixOS/nixpkgs/64049ca74d63e971b627b5f3178d95642e61cedd?narHash=sha256-yA/CuWyqm%2BAQo2ivGy6PlYrjZBQm7jfbe461%2B4HF2fo%3D' (2026-01-02)
2026-01-04 09:21:38 +01:00
home-manager-ci[bot]
d49d2543f0 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/f560ccec6b1116b22e6ed15f4c510997d99d5852?narHash=sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ%3D' (2025-12-26)
  → 'github:NixOS/nixpkgs/89dbf01df72eb5ebe3b24a86334b12c27d68016a?narHash=sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo%3D' (2025-12-29)
2026-01-01 09:17:35 -06:00
8 changed files with 36 additions and 4 deletions

6
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1766736597,
"narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
"lastModified": 1767799921,
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
"type": "github"
},
"original": {

View File

@@ -40,6 +40,12 @@ let
description = "The remote path to mount.";
};
mountDestPath = mkOption {
type = types.nullOr types.str;
default = null;
description = "The path on the current machine where the remote path would be mounted.";
};
authType = mkOption {
type = types.enum [
"password"
@@ -47,6 +53,7 @@ let
"hostbased"
"keyboard-interactive"
"gssapi-with-mic"
"authentication-agent"
];
default = "publickey";
description = "The authentication method to use.";

View File

@@ -12,7 +12,7 @@
{
source = realPkgs.fetchurl {
url = "https://keys.openpgp.org/pks/lookup?op=get&options=mr&search=0x44CF42371ADF842E12F116EAA9D3F98FCCF5460B";
hash = "sha256-bSluCZh6ijwppigk8iF2BwWKZgq1WDbIjyYQRK772dM=";
hash = "sha256-csrFDI6QSPfNN+adOPEAupAtspYNBCybFZExvVS+vRY=";
};
trust = 1; # "unknown"
}

View File

@@ -23,6 +23,13 @@
user = "user";
sshKey = "/home/user/.ssh/id_rsa";
};
mount4 = {
host = "host4.example.com";
mountPoint = "/another/path/somewhere/else";
user = "user";
authType = "authentication-agent";
mountDestPath = "/mnt/host4";
};
};
};
@@ -36,5 +43,8 @@
assertFileContent \
home-files/.config/sftpman/mounts/mount3.json \
${./expected-mount3.json}
assertFileContent \
home-files/.config/sftpman/mounts/mount4.json \
${./expected-mount4.json}
'';
}

View File

@@ -3,6 +3,7 @@
"beforeMount": "true",
"host": "host1.example.com",
"id": "mount1",
"mountDestPath": null,
"mountOptions": [
"idmap=user"
],

View File

@@ -3,6 +3,7 @@
"beforeMount": "true",
"host": "host2.example.com",
"id": "mount2",
"mountDestPath": null,
"mountOptions": [],
"mountPoint": "/another/path",
"port": 22,

View File

@@ -3,6 +3,7 @@
"beforeMount": "true",
"host": "host3.example.com",
"id": "mount3",
"mountDestPath": null,
"mountOptions": [],
"mountPoint": "/yet/another/path",
"port": 22,

View File

@@ -0,0 +1,12 @@
{
"authType": "authentication-agent",
"beforeMount": "true",
"host": "host4.example.com",
"id": "mount4",
"mountDestPath": "/mnt/host4",
"mountOptions": [],
"mountPoint": "/another/path/somewhere/else",
"port": 22,
"sshKey": "/home/user/.ssh/id_ed25519",
"user": "user"
}