diff options
| author | Shea Levy <shea@shealevy.com> | 2014-02-20 13:34:12 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-02-20 13:40:56 -0500 |
| commit | 17f88453f67bc1c54f5900a771c47d883a4a6c54 (patch) | |
| tree | 01efd5dbfc6258b91ac936dccb93875738f40221 /nixos | |
| parent | fefc0d9917aebab210a62fd80b09af8622c64e94 (diff) | |
| download | nixlib-17f88453f67bc1c54f5900a771c47d883a4a6c54.tar nixlib-17f88453f67bc1c54f5900a771c47d883a4a6c54.tar.gz nixlib-17f88453f67bc1c54f5900a771c47d883a4a6c54.tar.bz2 nixlib-17f88453f67bc1c54f5900a771c47d883a4a6c54.tar.lz nixlib-17f88453f67bc1c54f5900a771c47d883a4a6c54.tar.xz nixlib-17f88453f67bc1c54f5900a771c47d883a4a6c54.tar.zst nixlib-17f88453f67bc1c54f5900a771c47d883a4a6c54.zip | |
Don't complain if HOME isn't writable
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/shell.nix | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index 8052502c21ea..226105a0c979 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -28,34 +28,36 @@ in echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2 fi - if ! test -L $HOME/.nix-profile; then - if test "$USER" != root; then - ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile - else - # Root installs in the system-wide profile by default. - ln -s /nix/var/nix/profiles/default $HOME/.nix-profile - fi - fi + if test -w $HOME; then + if ! test -L $HOME/.nix-profile; then + if test "$USER" != root; then + ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile + else + # Root installs in the system-wide profile by default. + ln -s /nix/var/nix/profiles/default $HOME/.nix-profile + fi + fi - # Subscribe the root user to the NixOS channel by default. - if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then - echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels - fi + # Subscribe the root user to the NixOS channel by default. + if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then + echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels + fi - # Create the per-user garbage collector roots directory. - NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER - mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR - if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then - echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2 - fi + # Create the per-user garbage collector roots directory. + NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER + mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR + if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then + echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2 + fi - # Set up a default Nix expression from which to install stuff. - if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then - rm -f $HOME/.nix-defexpr - mkdir $HOME/.nix-defexpr - if [ "$USER" != root ]; then - ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root - fi + # Set up a default Nix expression from which to install stuff. + if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then + rm -f $HOME/.nix-defexpr + mkdir $HOME/.nix-defexpr + if [ "$USER" != root ]; then + ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root + fi + fi fi ''; |