From 9190fb143cec89b9c4670b7e09d0733f554f0c54 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sun, 3 Jul 2022 04:30:52 +0000 Subject: [PATCH] Fix Docker Integration with WSL2 Borrowed from https://github.com/nix-community/NixOS-WSL/issues/90 --- machines/gallantis/nixos-wsl/modules/docker-desktop.nix | 2 +- machines/gallantis/nixos-wsl/modules/wsl-distro.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/gallantis/nixos-wsl/modules/docker-desktop.nix b/machines/gallantis/nixos-wsl/modules/docker-desktop.nix index ea983d5..87b8c80 100644 --- a/machines/gallantis/nixos-wsl/modules/docker-desktop.nix +++ b/machines/gallantis/nixos-wsl/modules/docker-desktop.nix @@ -22,7 +22,7 @@ with lib; { systemd.services.docker-desktop-proxy = { description = "Docker Desktop proxy"; script = '' - ${config.wsl.automountPath}/wsl/docker-desktop/docker-desktop-proxy -docker-desktop-root ${config.wsl.automountPath}/wsl/docker-desktop + ${config.wsl.automountPath}/wsl/docker-desktop/docker-desktop-user-distro proxy --docker-desktop-root ${config.wsl.automountPath}/wsl/docker-desktop ''; wantedBy = ["multi-user.target"]; serviceConfig = { diff --git a/machines/gallantis/nixos-wsl/modules/wsl-distro.nix b/machines/gallantis/nixos-wsl/modules/wsl-distro.nix index 463459a..fbca467 100644 --- a/machines/gallantis/nixos-wsl/modules/wsl-distro.nix +++ b/machines/gallantis/nixos-wsl/modules/wsl-distro.nix @@ -22,7 +22,7 @@ with lib; { }; defaultUser = mkOption { type = str; - default = "nixos"; + default = "dave"; description = "The name of the default user"; }; startMenuLaunchers = mkEnableOption "shortcuts for GUI applications in the windows start menu";