diff --git a/ci-root.nix b/ci-root.nix index 04f63358dc..525815f6f6 100644 --- a/ci-root.nix +++ b/ci-root.nix @@ -29,6 +29,7 @@ let systemPathJSON = depot.ops.nixos.systemPathJSON; }; factorio = depot.ops.factorio; + home-manager = depot.ops.home-manager-ext.built; }; x86_64-darwin = { home-manager = depot.ops.home-manager-ext.built; diff --git a/ops/home-manager-ext.nix b/ops/home-manager-ext.nix index a9d6b09bc3..f2d4133cf1 100644 --- a/ops/home-manager-ext.nix +++ b/ops/home-manager-ext.nix @@ -14,6 +14,7 @@ let configs = { base = nixos/lib/home-manager/common.nix; client = nixos/lib/home-manager/client.nix; + porcorosso-wsl = nixos/lib/home-manager/porcorosso-wsl.nix; }; configModules = lib.mapAttrs cfg configs; @@ -21,7 +22,13 @@ let builtModules = lib.mapAttrs (name: value: (import ../third_party/home-manager/modules { inherit pkgs; - configuration = value; + configuration = { + imports = [ value ]; + config.nixpkgs.config = pkgs.config; + config.home.sessionVariablesExtra = '' + export PATH="$HOME/.nix-profile/bin''${PATH:+:}$PATH" + ''; + }; check = true; }).activationPackage) configModules; in diff --git a/ops/nixos/lib/home-manager/porcorosso-wsl.nix b/ops/nixos/lib/home-manager/porcorosso-wsl.nix new file mode 100644 index 0000000000..63e1f69c8a --- /dev/null +++ b/ops/nixos/lib/home-manager/porcorosso-wsl.nix @@ -0,0 +1,4 @@ +{ pkgs, depot, lib, config, ... }: +{ + imports = [ ./graphical-client-wayland.nix ]; +}