dotfiles

commit df78a0646f795409fcf1e856e686e66a31356154
parent 2b44bb22cd8b0c43e046d2a3c151e882eccf701f
Author: Alex Balgavy <alex@balgavy.eu>
Date:   Mon, 22 Nov 2021 19:00:41 +0100

Zsh changes because of Catalina

Diffstat:
M
dot.map
 | 
2
+-
D
shell/zshenv
 | 
6
------
M
shell/zshenv_bootstrap
 | 
1
-
M
shell/zshrc
 | 
7
+++++++

4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dot.map b/dot.map
@@ -85,7 +85,7 @@ emacs:
 # Config: shell
 shell:
 - zshenv_bootstrap: ~/.zshenv
-- zshenv: ~/.config/zsh/.zshenv
+# - zshenv: ~/.config/zsh/.zshenv # Catalina decided that /etc/zprofile should override a custom zshenv...so gotta stick everything in zshrc.
 - zshrc: ~/.config/zsh/.zshrc
 - inputrc: ~/.inputrc
 mime.types: ~/.mime.types
diff --git a/shell/zshenv b/shell/zshenv
@@ -1,6 +0,0 @@
-srcpath="$HOME/.dotfiles/shell"
-. "$srcpath"/env
-. "$srcpath"/paths
-unset srcpath
-export ZDOTDIR=$HOME/.config/zsh
-export HISTFILE=$ZDOTDIR/.zsh_history
diff --git a/shell/zshenv_bootstrap b/shell/zshenv_bootstrap
@@ -1,3 +1,2 @@
 #!/usr/bin/env zsh
 ZDOTDIR=$HOME/.config/zsh/
-. "$ZDOTDIR"/.zshenv
diff --git a/shell/zshrc b/shell/zshrc
@@ -6,6 +6,13 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 
+srcpath="$HOME/.dotfiles/shell"
+. "$srcpath"/env
+. "$srcpath"/paths
+unset srcpath
+export ZDOTDIR=$HOME/.config/zsh
+export HISTFILE=$ZDOTDIR/.zsh_history
+
 # ZSH-specific inits
 . "$DOTFILES"/shell/rc