Skip to content

Commit a4bbcf3

Browse files
authored
update remaining references to wsl.automountPath (#158)
1 parent ee805f8 commit a4bbcf3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

configuration.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ in
1010

1111
wsl = {
1212
enable = true;
13-
automountPath = "/mnt";
13+
wslConf.automount.root = "/mnt";
1414
defaultUser = "nixos";
1515
startMenuLaunchers = true;
1616

modules/docker-desktop.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ with builtins; with lib; {
2323
systemd.services.docker-desktop-proxy = {
2424
description = "Docker Desktop proxy";
2525
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
2727
'';
2828
wantedBy = [ "multi-user.target" ];
2929
serviceConfig = {

modules/wsl-distro.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ with lib; {
2222
cfg = config.wsl;
2323

2424
syschdemd = pkgs.callPackage ../scripts/syschdemd.nix {
25-
inherit (cfg) automountPath;
25+
automountPath = cfg.wslConf.automount.root;
2626
defaultUser = config.users.users.${cfg.defaultUser};
2727
};
2828

@@ -149,9 +149,9 @@ with lib; {
149149
# preserve $PATH from parent
150150
variables.PATH = [ "$PATH" ];
151151
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' ':')
153153
${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' ':')
155155
''}
156156
'';
157157
};

0 commit comments

Comments
 (0)