Merge pull request #1 from nzbr/relink-x11-socket

don't hardcode automount root
K900 · Jan 30, 2023 · fe26628 · fe26628
2 parents bc2ee24 + c590241
commit fe26628
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/wsl-conf.nix b/modules/wsl-conf.nix
@@ -20,7 +20,7 @@ with lib; {
         description = "Mount entries from /etc/fstab through WSL. You should probably leave this on false, because systemd will mount those for you.";
       };
       root = mkOption {
-        type = str;
+        type = strMatching "^/.*[^/]$";
         default = "/mnt/";
         description = "The directory under which to mount windows drives.";
       };

diff --git a/modules/wsl-distro.nix b/modules/wsl-distro.nix
@@ -127,7 +127,7 @@ with lib; {
 
             # Link the X11 socket into place. This is a no-op on a normal setup,
             # but helps if /tmp is a tmpfs or mounted from some other location.
-            tmpfiles.rules = [ "L /tmp/.X11-unix - - - - /mnt/wslg/.X11-unix" ];
+            tmpfiles.rules = [ "L /tmp/.X11-unix - - - - ${cfg.wslConf.automount.root}/wslg/.X11-unix" ];
           };
 
           # Start a systemd user session when starting a command through runuser