1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-16 09:02:36 +00:00

Merge pull request #96589 from deviant/nre-improvements

`nixos-rebuild edit` improvements
This commit is contained in:
edef 2020-08-29 17:26:09 +00:00 committed by GitHub
commit fcdfa881c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -288,7 +288,10 @@ fi
if [ "$action" = edit ]; then
if [[ -z $flake ]]; then
NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)}
exec "${EDITOR:-nano}" "$NIXOS_CONFIG"
if [[ -d $NIXOS_CONFIG ]]; then
NIXOS_CONFIG=$NIXOS_CONFIG/default.nix
fi
exec ${EDITOR:-nano} "$NIXOS_CONFIG"
else
exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr"
fi