Commit graph

908 commits

Author SHA1 Message Date
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
mergify[bot]
7e695c8064
Merge pull request #358 from nix-community/update_flake_lock_action
flake.lock: Update
2023-06-24 03:42:00 +00:00
mergify[bot]
f6a18e71a3
Merge branch 'master' into update_flake_lock_action 2023-06-24 03:38:52 +00:00
Jörg Thalheim
e9b101af0c mergify: also merge dependabot 2023-06-24 10:37:41 +07:00
github-actions[bot]
c6857ee043 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
  → 'github:numtide/flake-utils/abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c' (2023-06-19)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9401a0c780b49faf6c28adf55764f230301d0dce' (2023-06-11)
  → 'github:NixOS/nixpkgs/7b697d9698d5ae350e49e8eeb05c568708bdd9f0' (2023-06-21)
2023-06-22 01:44:18 +00:00
dependabot[bot]
77eb200782
Bump cachix/install-nix-action from 21 to 22
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 21 to 22.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v21...v22)

---
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-06-19 04:56:39 +00:00
mergify[bot]
73c4546a80
Merge pull request #355 from nix-community/update_flake_lock_action
flake.lock: Update
2023-06-12 04:35:57 +00:00
mergify[bot]
903d28fa2e
Merge branch 'master' into update_flake_lock_action 2023-06-12 04:31:29 +00:00
Jörg Thalheim
72f6cf0c10
Merge pull request #357 from nix-community/joerg-ci
mergify: drop lockfile step
2023-06-12 05:30:42 +01:00
Jörg Thalheim
ee3a1058e9 mergify: drop lockfile step 2023-06-12 06:30:28 +02:00
mergify[bot]
e19e049fe8
Merge branch 'master' into update_flake_lock_action 2023-06-12 04:16:41 +00:00
Jörg Thalheim
709e37b98f
Merge pull request #356 from nix-community/joerg-ci
fix default branch
2023-06-12 05:15:47 +01:00
Jörg Thalheim
a1824e083a fix default branch 2023-06-12 06:12:18 +02:00
github-actions[bot]
6198c00162 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/af21c31b2a1ec5d361ed8050edd0303c31306397' (2023-06-06)
  → 'github:NixOS/nixpkgs/9401a0c780b49faf6c28adf55764f230301d0dce' (2023-06-11)
2023-06-12 04:02:01 +00:00
Jörg Thalheim
b071fdb0dd
Merge pull request #354 from nix-community/mergify
replace bors with mergify
2023-06-12 05:01:00 +01:00
Jörg Thalheim
932dc8045c replace bors with mergify 2023-06-12 06:00:18 +02:00
bors[bot]
560e1eabd3
Merge #348
348: Bump cachix/install-nix-action from 20 to 21 r=Mic92 a=dependabot[bot]



Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-11 03:02:56 +00:00
bors[bot]
d4a7b7610c
Merge #352
352: flake.lock: Update r=Mic92 a=github-actions[bot]



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-06-11 02:59:44 +00:00
github-actions[bot]
4b5fbb3266 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/2e56a850786211972d99d2bb39665a9b5a1801d6' (2023-06-04)
  → 'github:NixOS/nixpkgs/af21c31b2a1ec5d361ed8050edd0303c31306397' (2023-06-06)
2023-06-08 01:50:51 +00:00
Bryan Bennett
77828c8a87
Merge pull request #351 from nix-community/update_flake_lock_action
flake.lock: Update
2023-06-05 15:03:37 -04:00
github-actions[bot]
f682e2cda4 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9cfaa8a1a00830d17487cb60a19bb86f96f09b27' (2023-05-31)
  → 'github:NixOS/nixpkgs/2e56a850786211972d99d2bb39665a9b5a1801d6' (2023-06-04)
2023-06-05 01:50:52 +00:00
Bryan Bennett
0433da1c16
Merge pull request #346 from nix-community/update_flake_lock_action
flake.lock: Update
2023-06-03 14:54:15 -04:00
github-actions[bot]
544bae5b88 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11)
  → 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/85340996ba67cc02f01ba324e18b1306892ed6f5' (2023-05-21)
  → 'github:NixOS/nixpkgs/9cfaa8a1a00830d17487cb60a19bb86f96f09b27' (2023-05-31)
2023-06-01 02:08:08 +00:00
dependabot[bot]
986dc8b1c5
Bump cachix/install-nix-action from 20 to 21
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 20 to 21.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v20...v21)

---
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-05-29 04:56:33 +00:00
bors[bot]
2e0ab68af4
Merge #345
345: also test nix-unstable r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-05-23 15:27:42 +00:00
Jörg Thalheim
e3d41d9c39 also test nix-unstable 2023-05-23 17:22:04 +02:00
bors[bot]
455506d6dd
Merge #343 #344
343: flake.lock: Update r=Mic92 a=github-actions[bot]



344: Refactor flake and testing r=Mic92 a=Mic92



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-05-23 14:06:44 +00:00
Jörg Thalheim
ba2b0a2b81 ci/test: only run on certain branches 2023-05-23 16:06:10 +02:00
Jörg Thalheim
1278fbd4cb update bors.toml 2023-05-23 16:03:04 +02:00
Jörg Thalheim
fd7dbd8e0d add garnix to flake.nix 2023-05-23 16:02:08 +02:00
Jörg Thalheim
2181e8c8e6 ci: accept binary cache 2023-05-23 16:02:08 +02:00
Jörg Thalheim
7f308330d5 split of linting from test 2023-05-23 16:02:08 +02:00