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

release: update all references to 20.03 with 20.09

Browse source
This commit is contained in:
Tobias Happ 2020-11-01 21:52:04 +01:00 • committed by Alexander Sosedkin
parent e6c7adaca0
commit d8a1d446f9
5 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

28
default.nix
View file

@ -25,8 +25,8 @@ rec {
is present) there is one manual step necessary *before* running the migration script: Remove basic-environment \
package of 'home.packages' list."
echo
echo "Recommended: change home-manager channel to release-20.03:"
echo " nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager"
echo "Recommended: change home-manager channel to release-20.09:"
echo " nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager"
echo
echo "Recommended: set nix-on-droid channel to a505862"
echo " nix-channel --add https://github.com/t184256/nix-on-droid/archive/pre-module-system.tar.gz nix-on-droid"
@ -38,8 +38,8 @@ rec {
echo
echo "Recommended: update with what you've used before (home-manager switch -or- nix-env -u)"
echo
echo "Required if you've followed the steps above: set nix-on-droid channel to release-20.03"
echo " nix-channel --add https://github.com/t184256/nix-on-droid/archive/release-20.03.tar.gz nix-on-droid"
echo "Required if you've followed the steps above: set nix-on-droid channel to release-20.09"
echo " nix-channel --add https://github.com/t184256/nix-on-droid/archive/release-20.09.tar.gz nix-on-droid"
echo
echo "Finally,"
echo " nix-shell '<nix-on-droid>' -A migration"
@ -73,44 +73,48 @@ rec {
echo "Migrating home-manager installation..."
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" ''
@@ -27,15 +27,9 @@
@@ -30,18 +30,8 @@
# Read the changelog before changing this value
system.stateVersion = "20.03";
system.stateVersion = "20.09";
- # After installing home-manager channel like
- # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager
- # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager
- # nix-channel --update
- # you can configure home-manager in here like
- #home-manager.config =
- # { pkgs, ... }:
- # {
- # # Read the changelog before changing this value
- # system.stateVersion = "20.09";
- #
- # # insert home-manager config
- # };
+ # Home Manager config file
+ home-manager.config = import ./home.nix;
+ home-manager.useUserPackages = true;
}
# vim: ft=nix
''} > /dev/null
else
${pkgs.patch}/bin/patch --no-backup-if-mismatch $HOME/.config/nixpkgs/nix-on-droid.nix ${pkgs.writeText "patch" ''
@@ -27,15 +27,9 @@
@@ -30,18 +30,8 @@
# Read the changelog before changing this value
system.stateVersion = "20.03";
system.stateVersion = "20.09";
- # After installing home-manager channel like
- # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.03.tar.gz home-manager
- # nix-channel --add https://github.com/rycee/home-manager/archive/release-20.09.tar.gz home-manager
- # nix-channel --update
- # you can configure home-manager in here like
- #home-manager.config =
- # { pkgs, ... }:
- # {
- # # Read the changelog before changing this value
- # system.stateVersion = "20.09";
- #
- # # insert home-manager config
- # };
+ # Home Manager config file
+ home-manager.config = import (builtins.getEnv "HOME_MANAGER_CONFIG");
+ home-manager.useUserPackages = true;
}
# vim: ft=nix