Fix zshrc loading

This commit is contained in:
Jeremy Wall 2023-06-26 19:18:28 -04:00
parent 21c5e483ec
commit 27ac738fc3
3 changed files with 9 additions and 26 deletions

View File

@ -1,23 +1,2 @@
export PAGER="less -R"
export EDITOR="nvim"
PS1="%F{green}[%T] %F{cyan}(%n@%m) %F{lightgrey}(%y)
%F{white}%(!.%F{red}>>.$>) "
export PATH="${PATH}:/opt/podman/bin"
# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/Users/zaphar/opt/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/Users/zaphar/opt/miniconda3/etc/profile.d/conda.sh" ]; then
. "/Users/zaphar/opt/miniconda3/etc/profile.d/conda.sh"
else
export PATH="/Users/zaphar/opt/miniconda3/bin:$PATH"
fi
fi
unset __conda_setup
# <<< conda initialize <<<
export PROMPT='%F{green}[%T] %F{cyan}(%n@%m) %F{lightgrey}(%y)
%F{white}%(!.>>.$>) '

View File

@ -48,6 +48,8 @@
programs = with pkgs; {
neovim.enable = true;
neovim.vimAlias = true;
neovim.viAlias = true;
neovim.configure = {
customRc = (builtins.readFile ./.vimrc);
packages.myVimPackage = with pkgs.vimPlugins; {
@ -75,6 +77,8 @@
};
};
zsh.enable = true; # default shell on catalina
# This is a total hack but we don't want the default clobbering it which it does if it's an empty string or null
zsh.promptInit = "#noop";
zsh.interactiveShellInit = (builtins.readFile ./.zshrc);
};
environment.systemPackages = (with pkgs; [

6
nix/darwin/flake.lock generated
View File

@ -32,12 +32,12 @@
},
"locked": {
"lastModified": 1,
"narHash": "sha256-FYoAPOEpojtsQR3jHFL7H1yC5hvffXWUhTNehjxiicM=",
"path": "/nix/store/9s2a41g96r1hgr9832cl0wbwij08s8yf-source/nix/base-system",
"narHash": "sha256-+GjHiziuT4s1/cWK9OjiMp1buxh4IVZ/zLmbZ+NNKBU=",
"path": "/nix/store/a8sqmhsq15h62prgyyy8j0ghi9213vpx-source/nix/base-system",
"type": "path"
},
"original": {
"path": "/nix/store/9s2a41g96r1hgr9832cl0wbwij08s8yf-source/nix/base-system",
"path": "/nix/store/a8sqmhsq15h62prgyyy8j0ghi9213vpx-source/nix/base-system",
"type": "path"
}
},