templates: simplify direnv configurations

This was mostly a copy-paste error (the `watch_file` calls). As for the shell hooks, it looks like `nix-direnv` takes care of that automatically.
direnv: fix 'watch_file' directives
2023-10-12 13:47:43 +00:00 · 2023-10-12 13:45:49 +00:00 · 2023-10-12 13:40:22 +00:00
3 changed files with 3 additions and 15 deletions
--- a/.envrc
+++ b/.envrc
@ -2,9 +2,7 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
 fi

+nix_direnv_watch_file ./flake/checks.nix
+nix_direnv_watch_file ./flake/dev-shells.nix
+
 use flake
-
-watch_file ./flake/checks.nix
-watch_file ./flake/dev-shells.nix
-
-eval "$shellHooks"
--- a/templates/c++-cmake/.envrc
+++ b/templates/c++-cmake/.envrc
@ -3,8 +3,3 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
 fi

 use flake
-
-watch_file ./flake/checks.nix
-watch_file ./flake/dev-shells.nix
-
-eval "$shellHooks"
--- a/templates/c++-meson/.envrc
+++ b/templates/c++-meson/.envrc
@ -3,8 +3,3 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
 fi

 use flake
-
-watch_file ./flake/checks.nix
-watch_file ./flake/dev-shells.nix
-
-eval "$shellHooks"
Author	SHA1	Message	Date
Bruno BELANYI	aca743dea7	templates: simplify direnv configurations All checks were successful ci/woodpecker/push/check Pipeline was successful Details This was mostly a copy-paste error (the `watch_file` calls). As for the shell hooks, it looks like `nix-direnv` takes care of that automatically.	2023-10-12 13:47:43 +00:00
Bruno BELANYI	e09899d59c	direnv: fix 'watch_file' directives I should use `nix_direnv_watch_file` and call it _before_ `use_flake`.	2023-10-12 13:45:49 +00:00
Bruno BELANYI	fd09346526	direnv: remove explicit 'shellHooks' evaluation I _think_ nix-direnv does it automatically, so no need to do it myself.	2023-10-12 13:40:22 +00:00