From c37c9cc77037dc511ea7683ea8e80795e3b9188f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 30 Oct 2023 16:21:16 +0200 Subject: feat(users/flokli/nixos): add direnv support Expose `deps` separately, add a direnv with PATH_add for it to bring tooling into $PATH. Change-Id: I432cd2b082cad89e08bef78dc4653e10e137cd6b Reviewed-on: https://cl.tvl.fyi/c/depot/+/9842 Reviewed-by: flokli Autosubmit: flokli Tested-by: BuildkiteCI --- users/flokli/nixos/.envrc | 1 + users/flokli/nixos/default.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 users/flokli/nixos/.envrc (limited to 'users/flokli') diff --git a/users/flokli/nixos/.envrc b/users/flokli/nixos/.envrc new file mode 100644 index 000000000000..ccf3cb847ac5 --- /dev/null +++ b/users/flokli/nixos/.envrc @@ -0,0 +1 @@ +PATH_add $(nix-build ../../.. -A users.flokli.nixos.deps --no-out-link)/bin diff --git a/users/flokli/nixos/default.nix b/users/flokli/nixos/default.nix index 90bda9f1a42b..c93363785cf1 100644 --- a/users/flokli/nixos/default.nix +++ b/users/flokli/nixos/default.nix @@ -28,13 +28,13 @@ depot.nix.readTree.drvTargets rec { deploy-archeology = (deployScript "archeology" archeologySystem); deploy-archeology-ec2 = (deployScript "archeology-ec2" archeologyEc2System); + deps = (depot.nix.lazy-deps { + deploy-archeology.attr = "users.flokli.nixos.deploy-archeology"; + deploy-archeology-ec2.attr = "users.flokli.nixos.deploy-archeology-ec2"; + }); + shell = pkgs.mkShell { name = "flokli-nixos-shell"; - packages = [ - (depot.nix.lazy-deps { - deploy-archeology.attr = "users.flokli.nixos.deploy-archeology"; - deploy-archeology-ec2.attr = "users.flokli.nixos.deploy-archeology-ec2"; - }) - ]; + packages = [ deps ]; }; } -- cgit 1.4.1