From 2efca9c650d11c7ffc3610d0b3f240999286cf92 Mon Sep 17 00:00:00 2001 From: sstent Date: Thu, 23 Feb 2023 10:40:41 -0500 Subject: [PATCH] sync --- hosts/wsl2/default.nix | 15 ++++++++++++++- modules/home-manager/sstent.nix | 15 --------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/hosts/wsl2/default.nix b/hosts/wsl2/default.nix index 63f1756..8c9dd89 100644 --- a/hosts/wsl2/default.nix +++ b/hosts/wsl2/default.nix @@ -49,7 +49,20 @@ nixpkgs.config.packageOverrides = pkgs: with pkgs; rec { - + systemd.user.units.ssh-proxy = { + Unit = { + Description = "WSL Proxy"; + }; + Service = { + ExecStart = "${pkgs.writeShellScript "start-proxy" '' + rm -f /tmp/.ssh-sock + setsid ${pkgs.socat}/bin/socat UNIX-LISTEN:/tmp/.ssh-sock,fork EXEC:"/mnt/c/ProgramData/chocolatey/bin/npiperelay.exe -ei -s //./pipe/openssh-ssh-agent",nofork + ''}"; + }; + Install = { + WantedBy = [ "default.target" ]; + }; + }; diff --git a/modules/home-manager/sstent.nix b/modules/home-manager/sstent.nix index 6b5b5bc..02711e2 100644 --- a/modules/home-manager/sstent.nix +++ b/modules/home-manager/sstent.nix @@ -102,21 +102,6 @@ programs = { }; - systemd.user.services.ssh-proxy = { - Unit = { - Description = "WSL Proxy"; - }; - Service = { - ExecStart = "${pkgs.writeShellScript "start-proxy" '' - rm -f /tmp/.ssh-sock - setsid ${pkgs.socat}/bin/socat UNIX-LISTEN:/tmp/.ssh-sock,fork EXEC:"/mnt/c/ProgramData/chocolatey/bin/npiperelay.exe -ei -s //./pipe/openssh-ssh-agent",nofork - ''}"; - }; - Install = { - WantedBy = [ "default.target" ]; - }; - }; - }; ### endf home-manager