sstent/vmimages
1
0
Fork 0
mirror of https://github.com/sstent/vmimages.git synced 2026-03-06 13:06:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
sstent
2023-02-20 13:20:26 +00:00
parent 5720d17f07
commit 9755a8f568
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flake.lock generated
View File

@@ -246,11 +246,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-jYKyhSKWW8XZHwETg4ix7lGrfQdcd3bwNWq9Jdn0WtU=", "narHash": "sha256-jYKyhSKWW8XZHwETg4ix7lGrfQdcd3bwNWq9Jdn0WtU=",
"path": "pkgs/npiperelay", "path": "./pkgs/npiperelay",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "pkgs/npiperelay", "path": "./pkgs/npiperelay",
"type": "path" "type": "path"
} }
}, },

2
flake.nix
View File

@@ -75,7 +75,7 @@
]; ];
specialArgs = { specialArgs = {
inherit inputs myData; inherit inputs myData overlays;
}; };
}; };

28
hosts/wsl2/default.nix
View File

@@ -1,12 +1,12 @@
{ lib, pkgs, config, modulesPath, ... }: { lib, pkgs, config, modulesPath, overlays, ... }:
{ {
nixpkgs.overlays = overlays;
# Enable nix flakes # Enable nix flakes
nix.package = pkgs.nixFlakes; nix.package = pkgs.nixFlakes;
nix.extraOptions = '' nix.extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
system.stateVersion = "22.11"; system.stateVersion = "22.11";
wsl = { wsl = {
@@ -15,7 +15,7 @@
defaultUser = "sstent"; defaultUser = "sstent";
startMenuLaunchers = true; startMenuLaunchers = true;
interop.preserveArgvZero = true; interop.preserveArgvZero = true;
nativeSystemd = true;
# Enable native Docker support # Enable native Docker support
# docker-native.enable = true; # docker-native.enable = true;
@@ -36,11 +36,31 @@ systemd.user.services.ssh-proxy = {
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.writeShellScript "start-proxy" '' ExecStart = "${pkgs.writeShellScript "start-proxy" ''
rm -f /tmp/.ssh-sock rm -f /tmp/.ssh-sock
setsid ${pkgs.socat}/bin/socat UNIX-LISTEN:/tmp/.ssh-sock,fork EXEC:"/mnt/c/ProgramData/chocolatey/lib/npiperelay/tools/npiperelay.exe -ei -s //./pipe/openssh-ssh-agent",nofork 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" ]; wantedBy = [ "default.target" ];
}; };
#pkgs.callPackage ./npiperelay.nix {}; #pkgs.callPackage ./npiperelay.nix {};
systemd.services.nixs-wsl-systemd-fix = {
description = "Fix the /dev/shm symlink to be a mount";
unitConfig = {
DefaultDependencies = "no";
Before = [ "sysinit.target" "systemd-tmpfiles-setup-dev.service" "systemd-tmpfiles-setup.service" "systemd-sysctl.service" ];
ConditionPathExists = "/dev/shm";
ConditionPathIsSymbolicLink = "/dev/shm";
ConditionPathIsMountPoint = "/run/shm";
};
serviceConfig = {
Type = "oneshot";
ExecStart = [
"${pkgs.coreutils-full}/bin/rm /dev/shm"
"/run/wrappers/bin/mount --bind -o X-mount.mkdir /run/shm /dev/shm"
];
};
wantedBy = [ "sysinit.target" ];
};
} }