diff --git a/hosts/wsl2/default.nix b/hosts/wsl2/default.nix index 76350de..d759fca 100644 --- a/hosts/wsl2/default.nix +++ b/hosts/wsl2/default.nix @@ -28,24 +28,28 @@ }; environment.systemPackages = - [ pkgs.socat ]; -# pkgs.npiperelay - pkgs.callPackage ../../pkgs/npiperelay/ {}; - - #npiperelay = import ../../pkgs/npiperelay/flake.nix { inherit pkgs; }; + [ pkgs.socat pks.npiperelay]; -systemd.user.services.ssh-proxy = { - description = "WSL Proxy"; - serviceConfig = { - ExecStart = "${pkgs.writeShellScript "start-proxy" '' - rm -f /tmp/.ssh-sock - setsid ${pkgs.socat}/bin/socat UNIX-LISTEN:/tmp/.ssh-sock,fork EXEC:"/run/current-system/sw/bin/npiperelay.exe -ei -s //./pipe/openssh-ssh-agent",nofork - ''}"; - }; - wantedBy = [ "default.target" ]; +packageOverrides = pkgs: with pkgs; rec { + npiperelay = callPackage ../../pkgs/npiperelay { inherit pkgs; }; }; -#pkgs.callPackage ./npiperelay.nix {}; + + + + + + + + + + + + + + + + systemd.services.nixs-wsl-systemd-fix = { description = "Fix the /dev/shm symlink to be a mount";