about summary refs log tree commit diff
path: root/users/flokli
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-10-30T14·21+0200
committerflokli <flokli@flokli.de>2023-10-30T14·32+0000
commitc37c9cc77037dc511ea7683ea8e80795e3b9188f (patch)
tree3fa5ec69c9f34f1ea9c1622ff9e3adcb3eb08fa1 /users/flokli
parent5b03bebce8e3860dfdee55930fe6c6ebdb1a9ed1 (diff)
feat(users/flokli/nixos): add direnv support r/6914
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 <flokli@flokli.de>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Diffstat (limited to 'users/flokli')
-rw-r--r--users/flokli/nixos/.envrc1
-rw-r--r--users/flokli/nixos/default.nix12
2 files changed, 7 insertions, 6 deletions
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 ];
   };
 }