From a4bbcf329a98a7faf79d10370278f87e836e1d7c Mon Sep 17 00:00:00 2001
From: nzbr <mail@nzbr.de>
Date: Wed, 9 Nov 2022 11:18:19 +0100
Subject: update remaining references to wsl.automountPath (#158)

---
 modules/docker-desktop.nix | 2 +-
 modules/wsl-distro.nix     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/docker-desktop.nix b/modules/docker-desktop.nix
index ade86e9..e2ae076 100644
--- a/modules/docker-desktop.nix
+++ b/modules/docker-desktop.nix
@@ -23,7 +23,7 @@ with builtins; with lib; {
       systemd.services.docker-desktop-proxy = {
         description = "Docker Desktop proxy";
         script = ''
-          ${config.wsl.automountPath}/wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${config.wsl.automountPath}/wsl/docker-desktop
+          ${config.wsl.wslConf.automount.root}/wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${config.wsl.wslConf.automount.root}/wsl/docker-desktop
         '';
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
diff --git a/modules/wsl-distro.nix b/modules/wsl-distro.nix
index 8dd5cce..cbbf1e8 100644
--- a/modules/wsl-distro.nix
+++ b/modules/wsl-distro.nix
@@ -22,7 +22,7 @@ with lib; {
       cfg = config.wsl;
 
       syschdemd = pkgs.callPackage ../scripts/syschdemd.nix {
-        inherit (cfg) automountPath;
+        automountPath = cfg.wslConf.automount.root;
         defaultUser = config.users.users.${cfg.defaultUser};
       };
 
@@ -149,9 +149,9 @@ with lib; {
             # preserve $PATH from parent
             variables.PATH = [ "$PATH" ];
             extraInit = ''
-              export WSLPATH=$(echo "$PATH" | tr ':' '\n' | grep -E "^${cfg.automountPath}" | tr '\n' ':')
+              export WSLPATH=$(echo "$PATH" | tr ':' '\n' | grep -E "^${cfg.wslConf.automount.root}" | tr '\n' ':')
               ${if cfg.interop.includePath then "" else ''
-                export PATH=$(echo "$PATH" | tr ':' '\n' | grep -vE "^${cfg.automountPath}" | tr '\n' ':')
+                export PATH=$(echo "$PATH" | tr ':' '\n' | grep -vE "^${cfg.wslConf.automount.root}" | tr '\n' ':')
               ''}
             '';
           };
-- 
cgit v1.2.3