Commit Graph

839 Commits

Author SHA1 Message Date
mergify[bot]
e5f4ccb533
Merge branch 'master' into dependabot/github_actions/cachix/install-nix-action-23 2023-09-11 10:56:22 +00:00
Jörg Thalheim
2d7b04bcdc
Merge pull request #380 from nix-community/update_flake_lock_action
flake.lock: Update
2023-09-11 12:55:47 +02:00
dependabot[bot]
5c8fd24dc1
Bump cachix/install-nix-action from 22 to 23
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 22 to 23.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v22...v23)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-11 04:54:36 +00:00
github-actions[bot]
39423c4a67 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3c15feef7770eb5500a4b8792623e2d6f598c9c1' (2023-09-04)
  → 'github:NixOS/nixpkgs/78058d810644f5ed276804ce7ea9e82d92bee293' (2023-09-10)
2023-09-11 01:13:58 +00:00
mergify[bot]
4e633c004e
Merge pull request #377 from nix-community/update_flake_lock_action
flake.lock: Update
2023-09-09 14:39:14 +00:00
mergify[bot]
03296161e8
Merge branch 'master' into update_flake_lock_action 2023-09-09 14:35:52 +00:00
mergify[bot]
fdd14f220d
Merge pull request #379 from nix-community/drop-keep-outputs
drop keep-outputs/keep-derivations from README
2023-09-09 14:34:58 +00:00
Jörg Thalheim
6642769872 drop keep-outputs/keep-derivations from README 2023-09-09 16:28:34 +02:00
github-actions[bot]
8c4d8e014a flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/cddebdb60de376c1bdb7a4e6ee3d98355453fe56' (2023-08-27)
  → 'github:NixOS/nixpkgs/3c15feef7770eb5500a4b8792623e2d6f598c9c1' (2023-09-04)
2023-09-07 01:13:09 +00:00
mergify[bot]
17d5f206ee
Merge pull request #375 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-20
Bump DeterminateSystems/update-flake-lock from 19 to 20
2023-08-29 18:39:46 +00:00
mergify[bot]
f913e66c36
Merge branch 'master' into dependabot/github_actions/DeterminateSystems/update-flake-lock-20 2023-08-29 18:10:44 +00:00
mergify[bot]
341fbd8126
Merge pull request #374 from nix-community/update_flake_lock_action
flake.lock: Update
2023-08-29 18:10:38 +00:00
mergify[bot]
be4359a149
Merge branch 'master' into update_flake_lock_action 2023-08-29 18:02:43 +00:00
Bryan Bennett
8687b45c06
Merge pull request #376 from Gerg-L/master
Update README.md
2023-08-29 14:00:04 -04:00
Gerg-L
07e3e5f00c
Update README.md 2023-08-28 19:56:07 -04:00
dependabot[bot]
b9ac68675f
Bump DeterminateSystems/update-flake-lock from 19 to 20
Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 19 to 20.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v19...v20)

---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-28 04:47:18 +00:00
github-actions[bot]
6599ae66d7 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
  → 'github:numtide/flake-utils/f9e7cf818399d17d347f847525c5a5a8032e4e44' (2023-08-23)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973' (2023-08-08)
  → 'github:NixOS/nixpkgs/cddebdb60de376c1bdb7a4e6ee3d98355453fe56' (2023-08-27)
2023-08-28 01:13:04 +00:00
mergify[bot]
cdc49872a3
Merge pull request #373 from nix-community/update_flake_lock_action
flake.lock: Update
2023-08-12 13:03:30 +00:00
mergify[bot]
19f522575b
Merge branch 'master' into update_flake_lock_action 2023-08-12 13:00:15 +00:00
Bryan Bennett
1f184ba8d5
Merge pull request #372 from cydparser/add-use-flake-warning
Warn when `use flake` receives a flag for the first argument
2023-08-12 08:59:40 -04:00
github-actions[bot]
fc53017f22 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e133d401e664303611d635ea62f15cfee9b4f7ae' (2023-08-06)
  → 'github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973' (2023-08-08)
2023-08-10 01:26:05 +00:00
cydparser
fc4fdbebf1 Simplify use_flake check for flag first arguments 2023-08-07 23:51:01 -07:00
cydparser
aeade6d235 Warn when use flake receives a flag for the first argument 2023-08-07 23:50:10 -07:00
mergify[bot]
1571256f62
Merge pull request #371 from nix-community/update_flake_lock_action
flake.lock: Update
2023-08-07 23:39:55 +00:00
mergify[bot]
6363712bbe
Merge branch 'master' into update_flake_lock_action 2023-08-07 23:36:36 +00:00
Bryan Bennett
0be95f9727
Merge pull request #368 from carschandler/patch-1
Update home-manager section of README
2023-08-07 19:35:35 -04:00
github-actions[bot]
76dd6818d3 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a9b47d85504bdd199e90846622c76aa0bfeabfac' (2023-07-25)
  → 'github:NixOS/nixpkgs/e133d401e664303611d635ea62f15cfee9b4f7ae' (2023-08-06)
2023-08-07 01:24:26 +00:00
carschandler
814b31e5c0
Update README.md
Markdown doesn't escape characters inside HTML tags.
2023-07-28 10:19:07 -05:00
mergify[bot]
ed2cb75553
Merge pull request #367 from nix-community/update_flake_lock_action
flake.lock: Update
2023-07-27 07:55:57 +00:00
mergify[bot]
7d810f7ac7
Merge branch 'master' into update_flake_lock_action 2023-07-27 07:52:10 +00:00
Jörg Thalheim
2af34e1aa9
Merge pull request #369 from nix-community/try-disable-nix-options
drop keep-outputs and keep-derivations from CI
2023-07-27 08:51:33 +01:00
Jörg Thalheim
a10c158d62 drop keep-outputs and keep-derivations from CI 2023-07-27 09:42:22 +02:00
github-actions[bot]
8801837369 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/29bcead8405cfe4c00085843eb372cc43837bb9d' (2023-07-15)
  → 'github:NixOS/nixpkgs/a9b47d85504bdd199e90846622c76aa0bfeabfac' (2023-07-25)
2023-07-27 01:21:02 +00:00
carschandler
9a9c5c4e5b
Update README.md for home-manager
The home-manager options have been changed (namely, nix-direnv is an option inside of programs.direnv). Also included the option for enabling Bash integration and left a note for how to enable integration for other shells through HM options... I also removed the section on keep-outputs and keep-derivations since, based on the Nix Manual, outputs/derivations that are registered as GC roots will be kept regardless of these settings (and as I understand it, nix-direnv does indeed register shells as GC roots). So telling users to enable these options would just keep behind extra garbage for them (in my opinion, one of the reasons to use nix-direnv is so that you DON'T have to enable these options and can keep garbage collecting everything else per usual.
2023-07-26 15:10:33 -05:00
Jörg Thalheim
a7510c9073
Merge pull request #366 from nix-community/update_flake_lock_action
flake.lock: Update
2023-07-17 07:29:05 +01:00
github-actions[bot]
6b87910291 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6fd9edc94426a3c050ad589c8f033b5ca55454c7' (2023-07-12)
  → 'github:NixOS/nixpkgs/29bcead8405cfe4c00085843eb372cc43837bb9d' (2023-07-15)
2023-07-17 02:00:32 +00:00
mergify[bot]
95712c7b12
Merge pull request #363 from nix-community/update_flake_lock_action
flake.lock: Update
2023-07-14 11:18:52 +00:00
mergify[bot]
3a9816854f
Merge branch 'master' into update_flake_lock_action 2023-07-14 11:15:40 +00:00
mergify[bot]
ec2c206605
Merge pull request #365 from Gerg-L/master
update installation instructions
2023-07-14 11:15:29 +00:00
Gerg-L
9331b560f4 update installation instructions 2023-07-13 22:21:53 -04:00
github-actions[bot]
9dab95911e flake.lock: Update
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7' (2023-06-25)
  → 'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
  → 'github:NixOS/nixpkgs/6fd9edc94426a3c050ad589c8f033b5ca55454c7' (2023-07-12)
2023-07-13 01:57:28 +00:00
mergify[bot]
3f9e573b2e
Merge pull request #359 from pelme/manual-refresh
Allow manual reload of nix environment.
2023-07-04 19:54:14 +00:00
Andreas Pelme
6b5822b75b Fixes for PR review:
- Always create the nix-direnv-reload script
- Use 0/1 for booleans
- Avoid crashing when profile_rc does not exist
- Use better internal variable name for manual mode
- Make use_nix work
- Avoid unneccessary forks
- Fix shellcheck failures
- Update mtime on profile rc files to avoid confusion about if the files
  are up to date
- Add instructions to README.md
2023-07-04 19:50:31 +00:00
Andreas Pelme
1df80c4c3a Run direnv reload after nix reload. 2023-07-04 19:50:31 +00:00
Andreas Pelme
828334a1c7 Use "reload" instead of "refresh" and create a script to make the reload. 2023-07-04 19:50:31 +00:00
Andreas Pelme
406a39036f Allow manual refresh of nix environment.
Adding nix_direnv_manual_refresh to .envrc will avoid the automatic
update of the nix environment on changes and allow the user to issue a
command to update the nix environment explicitly.

Sometimes it takes a long time to rebuild the nix environment and it
happens in times. Switching branches in or rebasing can be painful since
nix will re-evaluate between nix file changes.

This blog post explains the problems with blocking the shell:
https://dev.to/allenap/some-direnv-best-practices-actually-just-one-4864

This is a first prototype, the UX can certainly be improved a bit.
2023-07-04 19:50:30 +00:00
Jörg Thalheim
7d2fa41d8b
Merge pull request #362 from nix-community/update_flake_lock_action
flake.lock: Update
2023-07-04 20:46:16 +01:00
github-actions[bot]
c9c057b395 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c' (2023-06-19)
  → 'github:numtide/flake-utils/dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7' (2023-06-25)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7b697d9698d5ae350e49e8eeb05c568708bdd9f0' (2023-06-21)
  → 'github:NixOS/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01)
2023-07-03 01:54:35 +00:00
mergify[bot]
a737eb05fa
Merge pull request #360 from nix-community/dependabot/github_actions/cachix/install-nix-action-22
Bump cachix/install-nix-action from 21 to 22
2023-06-24 03:45:17 +00:00
mergify[bot]
a16e409108
Merge branch 'master' into dependabot/github_actions/cachix/install-nix-action-22 2023-06-24 03:42:05 +00:00