From c08430923ed417abc653884328a39e98496cfd0f Mon Sep 17 00:00:00 2001 From: "home-manager-ci[bot]" <214323736+home-manager-ci[bot]@users.noreply.github.com> Date: Wed, 7 Jan 2026 04:29:40 +0000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index de1b2c62..f5c3dc2d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1767325753, - "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", + "lastModified": 1767634882, + "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64049ca74d63e971b627b5f3178d95642e61cedd", + "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c", "type": "github" }, "original": { From 8c8a16d41353a174767c38b962359b51a56ca02e Mon Sep 17 00:00:00 2001 From: "home-manager-ci[bot]" <214323736+home-manager-ci[bot]@users.noreply.github.com> Date: Thu, 8 Jan 2026 05:14:19 +0000 Subject: [PATCH 2/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f5c3dc2d..4c9c3013 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1767634882, - "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=", + "lastModified": 1767799921, + "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c", + "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", "type": "github" }, "original": { From 82fb7dedaad83e5e279127a38ef410bcfac6d77c Mon Sep 17 00:00:00 2001 From: Michael Strobel Date: Thu, 8 Jan 2026 12:05:23 +0100 Subject: [PATCH 3/3] sftpman: add missing options - `authType` is missing the `authentication-agent` enum value - `mountDestPath` is missing completely (cherry picked from commit 3351348827926935b407d1cfbb7dd814c30da107) --- modules/programs/sftpman.nix | 7 +++++++ tests/modules/programs/sftpman/example-settings.nix | 10 ++++++++++ tests/modules/programs/sftpman/expected-mount1.json | 1 + tests/modules/programs/sftpman/expected-mount2.json | 1 + tests/modules/programs/sftpman/expected-mount3.json | 1 + tests/modules/programs/sftpman/expected-mount4.json | 12 ++++++++++++ 6 files changed, 32 insertions(+) create mode 100644 tests/modules/programs/sftpman/expected-mount4.json diff --git a/modules/programs/sftpman.nix b/modules/programs/sftpman.nix index 0201a6fc..f7bb55aa 100644 --- a/modules/programs/sftpman.nix +++ b/modules/programs/sftpman.nix @@ -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."; diff --git a/tests/modules/programs/sftpman/example-settings.nix b/tests/modules/programs/sftpman/example-settings.nix index b782fea2..5857c1a6 100644 --- a/tests/modules/programs/sftpman/example-settings.nix +++ b/tests/modules/programs/sftpman/example-settings.nix @@ -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} ''; } diff --git a/tests/modules/programs/sftpman/expected-mount1.json b/tests/modules/programs/sftpman/expected-mount1.json index 06124fd2..b532426b 100644 --- a/tests/modules/programs/sftpman/expected-mount1.json +++ b/tests/modules/programs/sftpman/expected-mount1.json @@ -3,6 +3,7 @@ "beforeMount": "true", "host": "host1.example.com", "id": "mount1", + "mountDestPath": null, "mountOptions": [ "idmap=user" ], diff --git a/tests/modules/programs/sftpman/expected-mount2.json b/tests/modules/programs/sftpman/expected-mount2.json index 384a9e93..46360d2c 100644 --- a/tests/modules/programs/sftpman/expected-mount2.json +++ b/tests/modules/programs/sftpman/expected-mount2.json @@ -3,6 +3,7 @@ "beforeMount": "true", "host": "host2.example.com", "id": "mount2", + "mountDestPath": null, "mountOptions": [], "mountPoint": "/another/path", "port": 22, diff --git a/tests/modules/programs/sftpman/expected-mount3.json b/tests/modules/programs/sftpman/expected-mount3.json index 5ee67962..d2024c95 100644 --- a/tests/modules/programs/sftpman/expected-mount3.json +++ b/tests/modules/programs/sftpman/expected-mount3.json @@ -3,6 +3,7 @@ "beforeMount": "true", "host": "host3.example.com", "id": "mount3", + "mountDestPath": null, "mountOptions": [], "mountPoint": "/yet/another/path", "port": 22, diff --git a/tests/modules/programs/sftpman/expected-mount4.json b/tests/modules/programs/sftpman/expected-mount4.json new file mode 100644 index 00000000..ad51fe19 --- /dev/null +++ b/tests/modules/programs/sftpman/expected-mount4.json @@ -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" +}