pederbs/config
pederbs
/
config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

no more flake lock merge conflicts!

This commit is contained in:
Peder Bergebakken Sundt 2024-02-29 18:40:19 +01:00
parent 0b7bef124d
commit ee6009a5d2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.envrc
View File

@ -4,8 +4,10 @@ git config --local core.hooksPath "$PWD"/.githooks
test -d .direnv || mkdir -p .direnv test -d .direnv || mkdir -p .direnv
now="$(date +%Y-%m-%d)" now="$(date +%Y-%m-%d)"
if ! test -s .direnv/pull-date || test "$now" != "$(cat .direnv/pull-date)"; then if ! test -s .direnv/pull-date || test "$now" != "$(cat .direnv/pull-date)"; then
git checkout -- flake.lock git reset flake.lock
git restore flake.lock
git pull --rebase --autostash git pull --rebase --autostash
grep -q "^=======" flake.lock && { git reset flake.lock; rm flake.lock; }
nix flake update nix flake update
#nix flake lock \ #nix flake lock \
# --update-input nixpkgs \ # --update-input nixpkgs \