From f939be52496a9357362fc7a727515b587c8a3bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 10 May 2025 19:48:34 +0200 Subject: [PATCH] env: make script aware of overlays --- Justfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Justfile b/Justfile index 916b8f43..150f8b1f 100644 --- a/Justfile +++ b/Justfile @@ -1,5 +1,7 @@ os host action: #!/usr/bin/env bash + set -euo pipefail + nixpkgs=$(nix-instantiate --eval -E "let sources = import ./nix/sources.nix {}; in sources.nixpkgs.outPath" | jq -r .) sudo nixos-rebuild {{ action }} \ -I nixpkgs=${nixpkgs} \ @@ -10,6 +12,8 @@ os host action: install host: #!/usr/bin/env bash + set -euo pipefail + nixpkgs=$(nix-instantiate --eval -E "let sources = import ./nix/sources.nix {}; in sources.nixpkgs.outPath" | jq -r .) sudo nixos-install \ -I nixpkgs=${nixpkgs} \ @@ -19,11 +23,19 @@ install host: env name action profilePath="~/.environments": #!/usr/bin/env bash + set -euo pipefail + # 1) realize the buildEnv derivation # 2) set the environment to it drv=$(nix-build -E " let sources = import ./nix/sources.nix {}; - pkgs = import sources.nixpkgs {}; + pkgs = import sources.nixpkgs { + overlays = [ + (import ./nix/overlays) + (import ./nix/overlays/packages.nix) + (import ./nix/overlays/packagesStable.nix) + ]; + }; in pkgs.callPackage ./nix/environments/{{ name }}.nix {} ") mkdir -p {{ profilePath }}