From df95c478514d08b3763fccf85afc662cbd6adf3d Mon Sep 17 00:00:00 2001 From: Spotlight Date: Thu, 4 May 2023 15:18:45 -0500 Subject: [PATCH 1/2] Source nix daemon if not already --- zshrc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/zshrc b/zshrc index 4252ff5..2b1470e 100644 --- a/zshrc +++ b/zshrc @@ -103,9 +103,8 @@ if [ -f $HOME/.keysrc ]; then fi # Allow nix if possible -if [ -d /nix ]; then - # https://github.com/NixOS/nix/issues/2033 - export NIX_PATH=$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels${NIX_PATH:+:$NIX_PATH} +if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then + . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' fi # Rust From d6d804239e9679666b66b9ad72afe5f90d0833a6 Mon Sep 17 00:00:00 2001 From: Spotlight Date: Thu, 4 May 2023 15:19:24 -0500 Subject: [PATCH 2/2] Migrate home-manager default path --- config/{nixpkgs => home-manager}/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename config/{nixpkgs => home-manager}/home.nix (96%) diff --git a/config/nixpkgs/home.nix b/config/home-manager/home.nix similarity index 96% rename from config/nixpkgs/home.nix rename to config/home-manager/home.nix index 6c6544c..fccbb3e 100644 --- a/config/nixpkgs/home.nix +++ b/config/home-manager/home.nix @@ -31,7 +31,7 @@ # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - home.stateVersion = "21.11"; + home.stateVersion = "22.11"; # Let Home Manager install and manage itself. programs.home-manager.enable = true;