Merge pull request #214 from K900/until-morale-improves

feat: use a Rust tool to do the PATH manipulations

Author: K900

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "rust-analyzer.linkedProjects": [
-        "scripts/native-systemd-shim/Cargo.toml"
+        "scripts/native-utils/Cargo.toml"
     ],
     "workbench.colorCustomizations": {
         "commandCenter.border": "#e7e7e799",

flake.nix

@@ -58,7 +58,7 @@
               username = pkgs.callPackage ./checks/username.nix args;
             };
 
-          packages.staticShim = pkgs.pkgsStatic.callPackage ./scripts/native-systemd-shim/shim.nix { };
+          packages.staticShim = pkgs.pkgsStatic.callPackage ./scripts/native-utils { };
 
           devShell = pkgs.mkShell {
             RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";

modules/wsl-distro.nix

@@ -26,7 +26,7 @@ with lib; {
         defaultUser = config.users.users.${cfg.defaultUser};
       };
 
-      shim = pkgs.callPackage ../scripts/native-systemd-shim/shim.nix { };
+      nativeUtils = pkgs.callPackage ../scripts/native-utils { };
 
       bashWrapper = pkgs.runCommand "nixos-wsl-bash-wrapper" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
         makeWrapper ${pkgs.bashInteractive}/bin/sh $out/bin/sh --prefix PATH ':' ${lib.makeBinPath [pkgs.systemd pkgs.gnugrep]}
@@ -159,7 +159,7 @@ with lib; {
             shimSystemd = stringAfter [ ] ''
               echo "setting up /sbin/init shim..."
               mkdir -p /sbin
-              ln -sf ${shim}/bin/nixos-wsl-native-systemd-shim /sbin/init
+              ln -sf ${nativeUtils}/bin/systemd-shim /sbin/init
             '';
             setupLogin = stringAfter [ ] ''
               echo "setting up /bin/login..."
@@ -172,10 +172,7 @@ with lib; {
             # preserve $PATH from parent
             variables.PATH = [ "$PATH" ];
             extraInit = ''
-              export WSLPATH=$(echo "$PATH" | tr ':' '\0' | command grep -az "^${cfg.wslConf.automount.root}" | tr '\0' ':')
-              ${if cfg.interop.includePath then "" else ''
-                export PATH=$(echo "$PATH" | tr ':' '\0' | command grep -avz "^${cfg.wslConf.automount.root}" | tr '\0' ':')
-              ''}
+              eval $(${nativeUtils}/bin/split-path --automount-root="${cfg.wslConf.automount.root}" ${lib.optionalString cfg.interop.includePath "--include-interop"})
             '';
           };
         })