From 259a6ed52e62ae0da44295ecf6b0840c1172c4d3 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 30 Nov 2022 16:17:07 +0000 Subject: [PATCH] Add correct channels --- setup-home.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/setup-home.sh b/setup-home.sh index f36c94a..75cd79c 100644 --- a/setup-home.sh +++ b/setup-home.sh @@ -2,7 +2,16 @@ [ -e ~/dotfiles ] || git clone git@codeberg.org:djm/dotfiles.git -nix-channel --add https://github.com/nix-community/home-manager/archive/release-$(nixos-version | cut -d. -f1-2).tar.gz home-manager +if [ -x "$(command -v nixos-version)" ]; then + # On NixOS use the hm version corresponding to the NixOS version, and add nixos-unstable as unstable + nix-channel --add https://github.com/nix-community/home-manager/archive/release-$(nixos-version | cut -d. -f1-2).tar.gz home-manager + nix-channel --add https://nixos.org/channels/nixos-unstable unstable +else + # On other systems use master, and add nixpkgs-unstable as unstable for compatibility between NixOS and non-NixOS installations + nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager + nix-channel --add https://nixos.org/channels/nixpkgs-unstable unstable +fi + nix-channel --update export NIX_PATH=$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels${NIX_PATH:+:$NIX_PATH}