From 6a9b94ab8ea12a9f112406a9d6916466296cb114 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 20 Apr 2023 19:32:51 -0400 Subject: nix .envrc read local settings if any --- .envrc | 6 +++--- flake.lock | 14 +++++++------- org/config_nix.org | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.envrc b/.envrc index 093f4ee..952ad02 100644 --- a/.envrc +++ b/.envrc @@ -9,9 +9,9 @@ fi watch_file flake.lock watch_file flake.nix watch_file makefile -#if [ -f .envrc-local ]; then -# source_env_if_exists .envrc-local || source .envrc-local -#fi +if [ -f .envrc-local ]; then + source_env_if_exists .envrc-local || source .envrc-local +fi PATH_add result/bin use flake . #use flake .#default diff --git a/flake.lock b/flake.lock index 0201d51..88efd63 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681753173, - "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=", + "lastModified": 1681956304, + "narHash": "sha256-unQAkIwasSPc51R+CHF+r+58WM4bU/lEnXPSpi6yAxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125", + "rev": "5b7bbca14c3627153bd305bec9a71f98b56c140c", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1681162928, - "narHash": "sha256-lR+36LESgWKUtGc74TABMeBsPB9R8AKVKil/CDBA0LY=", + "lastModified": 1682032940, + "narHash": "sha256-VbWw3334PhRr7w/aHpddBGVbIfVCQeag9z8haxlNIFg=", "ref": "refs/heads/main", - "rev": "e3ced89491d3b39d29ba2ae824a474ef14ebb207", - "revCount": 576, + "rev": "cff8fea1ee232fcb751b2d6d3e7bfe4ef4060247", + "revCount": 577, "type": "git", "url": "file:///home/ralph/grotto/repo/git.repo/projects/doc-reform/code/software/spine" }, diff --git a/org/config_nix.org b/org/config_nix.org index e43ffbd..7153926 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -35,9 +35,9 @@ fi watch_file flake.lock watch_file flake.nix watch_file makefile -#if [ -f .envrc-local ]; then -# source_env_if_exists .envrc-local || source .envrc-local -#fi +if [ -f .envrc-local ]; then + source_env_if_exists .envrc-local || source .envrc-local +fi PATH_add result/bin use flake . #use flake .#default -- cgit v1.2.3