diff --git a/dot_config/nixpkgs/config.nix b/dot_config/nixpkgs/config.nix index e68dc90..69c444a 100644 --- a/dot_config/nixpkgs/config.nix +++ b/dot_config/nixpkgs/config.nix @@ -1,3 +1,4 @@ +# https://nixos.org/manual/nixpkgs/stable/#sec-declarative-package-management { packageOverrides = pkgs: with pkgs; { myPackages = pkgs.buildEnv { diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index 7ffbe29..4ef7357 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -63,6 +63,10 @@ key[Control-Right]="${terminfo[kRIT5]}" [[ -n "${key[Control-Left]}" ]] && bindkey -- "${key[Control-Left]}" backward-word [[ -n "${key[Control-Right]}" ]] && bindkey -- "${key[Control-Right]}" forward-word +# nix config (load nix first to get available pkgs in PATH) +if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then + . $HOME/.nix-profile/etc/profile.d/nix.sh; +fi # custom PATH path+=("$HOME"'/.local/bin') @@ -156,12 +160,11 @@ if command -v pyenv &> /dev/null; then eval "$(pyenv init -)" fi -# nix config -if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then - . $HOME/.nix-profile/etc/profile.d/nix.sh; +# direnv +if command -v direnv &> /dev/null; then + eval "$(direnv hook zsh)" fi - # editors export EDITOR="nvim" export VISUAL="code"