diff --git a/.envrc b/.envrc index afb31ac..197c0d5 100644 --- a/.envrc +++ b/.envrc @@ -1,6 +1,3 @@ #!/bin/bash -if ! has nix_direnv_version || ! nix_direnv_version 3.1.1; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.1.1/direnvrc" "sha256-p+fzQdrms/hDa7g+soShAybJNo4bN4SIAeSfqNKgD5I=" -fi use flake diff --git a/README.md b/README.md index 0018795..d14b055 100644 --- a/README.md +++ b/README.md @@ -39,18 +39,11 @@ When making changes, adhere to [aoshima's charter](https://github.com/dataheld/a > [!TIP] > The steps below are **system / user** prerequisites. > Project-specific software is handled by the flake once you are inside the repo. -> Providing `direnv` and `nix-direnv` is user-environment policy ([dataheld/lap](https://github.com/dataheld/lap)), not something each project should own forever. -> Templates may still bootstrap `nix-direnv` from `.envrc` until that lands ([#35](https://github.com/dataheld/nullkomma/issues/35)). 1. Install Nix (the package manager). The [Determinate Nix Installer](https://github.com/DeterminateSystems/nix-installer) is recommended. -1. Install [direnv](https://direnv.net). - -1. (optional, recommended) Install - [nix-direnv](https://github.com/nix-community/nix-direnv) - for better performance during development. - Prefer installing it once in your user environment rather than relying on per-project `.envrc` bootstraps. +For automatic flake-shell activation, provide [direnv](https://direnv.net) and [nix-direnv](https://github.com/nix-community/nix-direnv) in your user environment (managed via [lap](https://github.com/dataheld/lap) or installed manually). 1. Add the necessary boilerplate files. diff --git a/templates/base/.envrc b/templates/base/.envrc index 4cacafe..197c0d5 100644 --- a/templates/base/.envrc +++ b/templates/base/.envrc @@ -1,6 +1,3 @@ #!/bin/bash -if ! has nix_direnv_version || ! nix_direnv_version 3.1.1; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.1.1/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=" -fi use flake