diff options
Diffstat (limited to '')
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | README.md | 21 | ||||
| -rw-r--r-- | doc/installation.xml | 22 | ||||
| -rwxr-xr-x | modules/lib-bash/activation-init.sh | 28 |
4 files changed, 24 insertions, 50 deletions
diff --git a/.travis.yml b/.travis.yml index f9e506a56af..039551c4274 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,6 @@ os: - linux - osx -before_script: - - mkdir -m 0755 -p /nix/var/nix/{profiles,gcroots}/per-user/$USER - script: - ./format -c - nix-shell . -A install diff --git a/README.md b/README.md index ee41290847c..905bd09ea94 100644 --- a/README.md +++ b/README.md @@ -46,21 +46,12 @@ Installation Currently the easiest way to install Home Manager is as follows: -1. Make sure you have a working Nix installation. If you are not - using NixOS then you may here have to run - - ```console - $ mkdir -m 0755 -p /nix/var/nix/{profiles,gcroots}/per-user/$USER - ``` - - since Home Manager uses these directories to manage your profile - generations. On NixOS these should already be available. - - Also make sure that your user is able to build and install Nix - packages. For example, you should be able to successfully run a - command like `nix-instantiate '<nixpkgs>' -A hello` without having - to switch to the root user. For a multi-user install of Nix this - means that your user must be covered by the +1. Make sure you have a working Nix installation. Specifically, make + sure that your user is able to build and install Nix packages. For + example, you should be able to successfully run a command like + `nix-instantiate '<nixpkgs>' -A hello` without having to switch to + the root user. For a multi-user install of Nix this means that + your user must be covered by the [`allowed-users`][nixAllowedUsers] Nix option. On NixOS you can control this option using the [`nix.allowedUsers`][nixosAllowedUsers] system option. diff --git a/doc/installation.xml b/doc/installation.xml index ef720c606e9..4c5d1f735bb 100644 --- a/doc/installation.xml +++ b/doc/installation.xml @@ -44,22 +44,12 @@ <orderedlist> <listitem> <para> - Make sure you have a working Nix installation. If you are not using NixOS - then it may be necessary to run - </para> -<screen> -<prompt>$</prompt> <userinput>mkdir -m 0755 -p /nix/var/nix/{profiles,gcroots}/per-user/$USER</userinput> -</screen> - <para> - since Home Manager uses these directories to manage your profile - generations. On NixOS these should already be available. - </para> - <para> - Also make sure that your user is able to build and install Nix packages. - For example, you should be able to successfully run a command like - <literal>nix-instantiate '<nixpkgs>' -A hello</literal> without - having to switch to the root user. For a multi-user install of Nix this - means that your user must be covered by the + Make sure you have a working Nix installation. Specifically, make + sure that your user is able to build and install Nix packages. + For example, you should be able to successfully run a command + like <literal>nix-instantiate '<nixpkgs>' -A hello</literal> + without having to switch to the root user. For a multi-user + install of Nix this means that your user must be covered by the <link xlink:href="https://nixos.org/nix/manual/#conf-allowed-users"><literal>allowed-users</literal></link> Nix option. On NixOS you can control this option using the <link xlink:href="https://nixos.org/nixos/manual/options.html#opt-nix.allowedUsers"><literal>nix.allowedUsers</literal></link> diff --git a/modules/lib-bash/activation-init.sh b/modules/lib-bash/activation-init.sh index 5cdb66e5920..5da81e1840f 100755 --- a/modules/lib-bash/activation-init.sh +++ b/modules/lib-bash/activation-init.sh @@ -3,13 +3,16 @@ function setupVars() { local profilesPath="/nix/var/nix/profiles/per-user/$USER" local gcPath="/nix/var/nix/gcroots/per-user/$USER" - local greatestGenNum + genProfilePath="$profilesPath/home-manager" + newGenPath="@GENERATION_DIR@"; + newGenGcPath="$gcPath/current-home" + + local greatestGenNum greatestGenNum=$( \ - find "$profilesPath" -name 'home-manager-*-link' \ - | sed 's/^.*-\([0-9]*\)-link$/\1/' \ - | sort -rn \ - | head -1) + nix-env --list-generations --profile "$genProfilePath" \ + | tail -1 \ + | sed -E 's/ *([[:digit:]]+) .*/\1/') if [[ -n $greatestGenNum ]] ; then oldGenNum=$greatestGenNum @@ -18,15 +21,15 @@ function setupVars() { newGenNum=1 fi - if [[ -e $gcPath/current-home ]] ; then - oldGenPath="$(readlink -e "$gcPath/current-home")" + if [[ -e $profilesPath/home-manager ]] ; then + oldGenPath="$(readlink -e "$profilesPath/home-manager")" fi $VERBOSE_ECHO "Sanity checking oldGenNum and oldGenPath" if [[ -v oldGenNum && ! -v oldGenPath || ! -v oldGenNum && -v oldGenPath ]]; then - errorEcho "Invalid profile number and GC root values! These must be" - errorEcho "either both empty or both set but are now set to" + errorEcho "Invalid profile number and current profile values! These" + errorEcho "must be either both empty or both set but are now set to" errorEcho " '${oldGenNum:-}' and '${oldGenPath:-}'" errorEcho "If you don't mind losing previous profile generations then" errorEcho "the easiest solution is probably to run" @@ -35,12 +38,6 @@ function setupVars() { errorEcho "and trying home-manager switch again. Good luck!" exit 1 fi - - - genProfilePath="$profilesPath/home-manager" - newGenPath="@GENERATION_DIR@"; - newGenProfilePath="$profilesPath/home-manager-$newGenNum-link" - newGenGcPath="$gcPath/current-home" } if [[ -v VERBOSE ]]; then @@ -78,6 +75,5 @@ else fi $VERBOSE_ECHO " newGenPath=$newGenPath" $VERBOSE_ECHO " newGenNum=$newGenNum" -$VERBOSE_ECHO " newGenProfilePath=$newGenProfilePath" $VERBOSE_ECHO " newGenGcPath=$newGenGcPath" $VERBOSE_ECHO " genProfilePath=$genProfilePath" |