nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflicts with previous home-manager installations

Browse source
This commit is contained in:
Tobias Happ 2019-11-30 22:40:16 +01:00 • committed by Alexander Sosedkin
parent c6a2a992fe
commit db4604d78d
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
default.nix
View file

@ -41,6 +41,8 @@ rec {
shellHook = '' shellHook = ''
set -eu -o pipefail set -eu -o pipefail
export GC_NPROCS=1 # to prevent gc warnings of nix, see https://github.com/NixOS/nix/issues/3237
echo "Installing nix-on-droid.nix default config file..." echo "Installing nix-on-droid.nix default config file..."
${pkgs.coreutils}/bin/mkdir --parents $HOME/.config/nixpkgs ${pkgs.coreutils}/bin/mkdir --parents $HOME/.config/nixpkgs
${pkgs.coreutils}/bin/cp ${./modules/environment/login/nix-on-droid.nix.default} $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.coreutils}/bin/cp ${./modules/environment/login/nix-on-droid.nix.default} $HOME/.config/nixpkgs/nix-on-droid.nix
@ -50,7 +52,7 @@ rec {
echo "Migrating home-manager installation..." echo "Migrating home-manager installation..."
if [[ -r "$HOME/.config/nixpkgs/home.nix" ]]; then if [[ -r "$HOME/.config/nixpkgs/home.nix" ]]; then
${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" '' ${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" ''
@@ -27,15 +27,8 @@ @@ -27,15 +27,9 @@
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "19.09"; system.stateVersion = "19.09";
@ -65,13 +67,14 @@ rec {
- # }; - # };
+ # Home Manager config file + # Home Manager config file
+ home-manager.config = import ./home.nix; + home-manager.config = import ./home.nix;
+ home-manager.useUserPackages = true;
} }
# vim: ft=nix # vim: ft=nix
''} > /dev/null ''} > /dev/null
else else
${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" '' ${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" ''
@@ -27,15 +27,8 @@ @@ -27,15 +27,9 @@
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "19.09"; system.stateVersion = "19.09";
@ -86,11 +89,15 @@ rec {
- # }; - # };
+ # Home Manager config file + # Home Manager config file
+ home-manager.config = import (builtins.getEnv "HOME_MANAGER_CONFIG"); + home-manager.config = import (builtins.getEnv "HOME_MANAGER_CONFIG");
+ home-manager.useUserPackages = true;
} }
# vim: ft=nix # vim: ft=nix
''} > /dev/null ''} > /dev/null
fi fi
echo "Uninstall home-manager-path..."
${pkgs.nix}/bin/nix-env --uninstall home-manager-path
fi fi
echo "Decrease priority of basic-environment..." echo "Decrease priority of basic-environment..."