1,3c1,3
< if [ -n $HOME -a -n $USER ]
<     set -l __savedpath $PATH
<     set -xg PATH @coreutils@
---
> if set -q HOME; and set -q USER
>     set -l __savedpath "$PATH"
>     set -x PATH @coreutils@
8c8
<     set -l NIX_LINK $HOME/.nix-profile
---
>     set -l NIX_LINK "$HOME"/.nix-profile
10c10
<     set -l NIX_USER_PROFILE_DIR @localstatedir@/nix/profiles/per-user/$USER
---
>     set -l NIX_USER_PROFILE_DIR @localstatedir@/nix/profiles/per-user/"$USER"
12c12
<     mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
---
>     mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
14,15c14,15
<     if [ (stat --printf '%u' $NIX_USER_PROFILE_DIR) -ne (id -u) ]
<         echo "Nix: WARNING: bad ownership on $NIX_USER_PROFILE_DIR, should be "(id -u) >&2
---
>     if [ (stat --printf '%u' "$NIX_USER_PROFILE_DIR") != (id -u) ]
>         echo Nix: WARNING: bad ownership on "$NIX_USER_PROFILE_DIR", should be (id -u) > output.stderr
18,24c18,23
<     if [ -w $HOME ]
<         if not [ -L $NIX_LINK ]
<             echo "Nix: creating $NIX_LINK" >&2
<             if [ $USER != root ]
<                 ln -s $NIX_USER_PROFILE_DIR/profile $NIX_LINK
<                 if [ $status -ne 0 ]
<                     echo "Nix: WARNING: could not create $NIX_LINK -> $NIX_USER_PROFILE_DIR/profile" >&2
---
>     if [ -w "$HOME" ]
>         if not [ -L "$NIX_LINK" ]
>             echo Nix: creating "$NIX_LINK" > output.stderr
>             if [ "$USER" != root ]
>                 if not ln -s "$NIX_USER_PROFILE_DIR"/profile $NIX_LINK
>                     echo Nix: WARNING: could not create "$NIX_LINK" -> "$NIX_USER_PROFILE_DIR"/profile > output.stderr
28c27
<                 ln -s @localstatedir@/nix/profiles/default $NIX_LINK
---
>                 ln -s @localstatedir@/nix/profiles/default "$NIX_LINK"
33,34c32,33
<         if not [ -e $HOME/.nix-channels ]
<             echo 'https://nixos.org/channels/nixpkgs-unstable nixpkgs' > $HOME/.nix-channels
---
>         if not [ -e "$HOME"/.nix-channels ]
>             echo "https://nixos.org/channels/nixpkgs-unstable nixpkgs" > "$HOME"/.nix-channels
38,41c37,40
<         set -l __user_gcroots @localstatedir@/nix/gcroots/per-user/$USER
<         mkdir -m 0755 -p $__user_gcroots
<         if [ (stat --printf '%u' $__user_gcroots) -ne (id -u) ]
<             echo "Nix: WARNING: bad ownership on $__user_gcroots, should be "(id -u) >&2
---
>         set -l __user_gcroots @localstatedir@/nix/gcroots/per-user/"$USER"
>         mkdir -m 0755 -p "$__user_gcroots"
>         if [ (stat --printf '%u' "$__user_gcroots") != (id -u) ]
>             echo Nix: WARNING: bad ownership on "$__user_gcroots", should be (id -u) > output.stderr
45,51c44,48
<         set -l __nix_defexpr $HOME/.nix-defexpr
<         if [ -L $__nix_defexpr ]; rm -f $__nix_defexpr; end
<         mkdir -m 0755 -p $__nix_defexpr
<         if [ $USER != root ]
<             if not [ -L $__nix_defexpr/channels_root ]
<                 ln -s @localstatedir@/nix/profiles/per-user/root/channels "$__nix_defexpr"/channels_root
<             end
---
>         set -l __nix_defexpr "$HOME"/.nix-defexpr
>         [ -L "$__nix_defexpr" ]; and rm -f "$__nix_defexpr"
>         mkdir -m 0755 -p "$__nix_defexpr"
>         if [ "$USER" != root ]; and; not [ -L "$__nix_defexpr"/channels_root ]
>             ln -s @localstatedir@/nix/profiles/per-user/root/channels "$__nix_defexpr"/channels_root
58c55,58
<     set -xg NIX_PATH (string join : $NIX_PATH nixpkgs=$HOME/.nix-defexpr/channels/nixpkgs)
---
>     if set -q NIX_PATH
>       set -x NIX_PATH "$NIX_PATH":
>     end
>     set -x NIX_PATH "$NIX_PATH"nixpkgs="$HOME"/.nix-defexpr/channels/nixpkgs
65,66c65,66
<         if [ -d "$i/lib/aspell" ]
<             set -xg ASPELL_CONF "dict-dir $i/lib/aspell"
---
>         if [ -d "$i"/lib/aspell ]
>             set -x ASPELL_CONF "dict-dir $i/lib/aspell"
71,72c71,72
<     if [ -e /etc/ssl/certs/ca-certificates.crt ] # NixOS, Ubuntu, Debian, Gentoo, Arch
<         set -xg SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt
---
>     if [ -e /etc/ssl/certs/ca-certiendcates.crt ] # NixOS, Ubuntu, Debian, Gentoo, Arch
>         set -x SSL_CERT_FILE /etc/ssl/certs/ca-certiendcates.crt
74c74
<         set -xg SSL_CERT_FILE /etc/ssl/ca-bundle.pem
---
>         set -x SSL_CERT_FILE /etc/ssl/ca-bundle.pem
76c76
<         set -xg SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt
---
>         set -x SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt
78,82c78,82
<         set -xg SSL_CERT_FILE /etc/pki/tls/certs/ca-bundle.crt
<     else if [ -e "$NIX_LINK/etc/ssl/certs/ca-bundle.crt" ] # fall back to cacert in Nix profile
<         set -xg SSL_CERT_FILE "$NIX_LINK/etc/ssl/certs/ca-bundle.crt"
<     else if [ -e "$NIX_LINK/etc/ca-bundle.crt" ] # old cacert in Nix profile
<         set -xg SSL_CERT_FILE "$NIX_LINK/etc/ca-bundle.crt"
---
>         set -x SSL_CERT_FILE /etc/pki/tls/certs/ca-bundle.crt
>     else if [ -e "$NIX_LINK"/etc/ssl/certs/ca-bundle.crt ] # fall back to cacert in Nix profile
>         set -x SSL_CERT_FILE "$NIX_LINK"/etc/ssl/certs/ca-bundle.crt
>     else if [ -e "$NIX_LINK"/etc/ca-bundle.crt ] # old cacert in Nix profile
>         set -x SSL_CERT_FILE "$NIX_LINK"/etc/ca-bundle.crt
85,86c85,86
<     if [ -n "$MANPATH" ]
<         set -xg MANPATH $NIX_LINK/share/man $MANPATH
---
>     if not set -q MANPATH
>         set -x MANPATH "$NIX_LINK"/share/man $MANPATH
89c89
<     set -xg PATH $NIX_LINK/bin $NIX_LINK/sbin $__savedpath
---
>     set -x PATH "$NIX_LINK"/bin "$NIX_LINK"/sbin $__savedpath