From 13b937fbb7c570aaf34aa0d93e4480e0ecf08a5e Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Tue, 30 Aug 2022 22:25:22 -0700
Subject: [PATCH] fix up /mnt/desko-root to be usable as a remote /nix store

---
 modules/universal/fs.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/universal/fs.nix b/modules/universal/fs.nix
index b95f2c2d7..d055ce44e 100644
--- a/modules/universal/fs.nix
+++ b/modules/universal/fs.nix
@@ -6,18 +6,20 @@ let sshOpts = rec {
     "x-systemd.automount"
     "_netdev"
     "user"
-    "transform_symlinks"
     "identityfile=/home/colin/.ssh/id_ed25519"
     "allow_other"
     "default_permissions"
   ];
   optionsColin = optionsBase ++ [
+    "transform_symlinks"
     "idmap=user"
     "uid=1000"
     "gid=100"
   ];
+
   optionsRoot = optionsBase ++ [
-    "sftp_server=/run/wrappers/bin/sudo\\040/nix/store/96idbd49a410sm35kfz7j8rzp5g983qb-openssh-9.0p1/libexec/sftp-server"
+    # we don't transform_symlinks because that breaks the validity of remote /nix stores
+    "sftp_server=/run/wrappers/bin/sudo\\040${pkgs.openssh}/libexec/sftp-server"
   ];
 };
 in