File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 10
10
11
11
wsl = {
12
12
enable = true ;
13
- automountPath = "/mnt" ;
13
+ wslConf . automount . root = "/mnt" ;
14
14
defaultUser = "nixos" ;
15
15
startMenuLaunchers = true ;
16
16
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ with builtins; with lib; {
23
23
systemd . services . docker-desktop-proxy = {
24
24
description = "Docker Desktop proxy" ;
25
25
script = ''
26
- ${ config . wsl . automountPath } /wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${ config . wsl . automountPath } /wsl/docker-desktop
26
+ ${ config . wsl . wslConf . automount . root } /wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${ config . wsl . wslConf . automount . root } /wsl/docker-desktop
27
27
'' ;
28
28
wantedBy = [ "multi-user.target" ] ;
29
29
serviceConfig = {
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ with lib; {
22
22
cfg = config . wsl ;
23
23
24
24
syschdemd = pkgs . callPackage ../scripts/syschdemd.nix {
25
- inherit ( cfg ) automountPath ;
25
+ automountPath = cfg . wslConf . automount . root ;
26
26
defaultUser = config . users . users . ${ cfg . defaultUser } ;
27
27
} ;
28
28
@@ -149,9 +149,9 @@ with lib; {
149
149
# preserve $PATH from parent
150
150
variables . PATH = [ "$PATH" ] ;
151
151
extraInit = ''
152
- export WSLPATH=$(echo "$PATH" | tr ':' '\n' | grep -E "^${ cfg . automountPath } " | tr '\n' ':')
152
+ export WSLPATH=$(echo "$PATH" | tr ':' '\n' | grep -E "^${ cfg . wslConf . automount . root } " | tr '\n' ':')
153
153
${ if cfg . interop . includePath then "" else ''
154
- export PATH=$(echo "$PATH" | tr ':' '\n' | grep -vE "^${ cfg . automountPath } " | tr '\n' ':')
154
+ export PATH=$(echo "$PATH" | tr ':' '\n' | grep -vE "^${ cfg . wslConf . automount . root } " | tr '\n' ':')
155
155
'' }
156
156
'' ;
157
157
} ;
You can’t perform that action at this time.
0 commit comments