From 844e0b64b2a00f1026075979c2cbd548dcb5f80b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 7 Dec 2023 17:32:31 -0500 Subject: nix flake related modifications --- org/nixpkgs_overlays_d_related.org | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'org/nixpkgs_overlays_d_related.org') diff --git a/org/nixpkgs_overlays_d_related.org b/org/nixpkgs_overlays_d_related.org index 6bd14f5..25a5f00 100644 --- a/org/nixpkgs_overlays_d_related.org +++ b/org/nixpkgs_overlays_d_related.org @@ -183,6 +183,7 @@ nix flake update && nix flake check --show-trace && nix flake info && echo "" && # find . -name "*.o" | xargs rm -rf ,* !.gitignore +!nixDevEnv.sh !.envrc !.envrc-local !.envrc-nix @@ -214,9 +215,9 @@ tmp/** #+END_SRC ** .env* -*** .envrc +*** nixDevEnv.sh (.envrc) -#+HEADER: :tangle-NO "../nix-overlays/.envrc" +#+HEADER: :tangle-NO "../nix-overlays/nixDevEnv.sh" #+BEGIN_SRC sh if [ -f .envrc-local ]; then source_env_if_exists .envrc-local || source .envrc-local @@ -272,12 +273,12 @@ watch_file flake.lock watch_file flake.nix watch_file shell.nix watch_file makefile -watch_file .envrc +watch_file nixDevEnv.sh watch_file .envrc-local watch_file .envrc-nix nix_direnv_watch_file flake.nix nix_direnv_watch_file shell.nix -nix_direnv_watch_file .envrc +nix_direnv_watch_file nixDevEnv.sh nix_direnv_watch_file .envrc-local nix_direnv_watch_file .envrc-nix nix flake update @@ -305,7 +306,7 @@ use flake . } @ inputs: let name = "dev-dub"; shell = ./shell.nix; - devEnv = ./.envrc; + devEnv = ./nixDevEnv.sh; # ./.envrc; supportedSystems = ["x86_64-linux"]; forAllSystems = nixpkgs.lib.genAttrs supportedSystems; nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); -- cgit v1.2.3