Fixed merge conflict

zsh/.config/zsh/.zshrc

@@ -1,8 +1,4 @@
 
-# configure keeping history of commands
-
-
-# TODO: move to $ZDOTDIR/.zsh_history
 setopt appendhistory
 setopt sharehistory
 setopt incappendhistory

zsh/.config/zsh/zsh-aliases

@@ -4,6 +4,7 @@ alias cdots() { cd "$HOME/.dotfiles" }
 alias zdots() { nvim "$ZDOTDIR" }
 alias dots() { nvim ~/.dotfiles }
 alias reload() { source "$ZDOTDIR/.zshrc" }
+alias banner() { clear && cat < "$ZDOTDIR/banner" }
 
 alias mkcd() { mkdir $1 && cd $1 }
 alias l() { ls -lah "$@" }
@@ -19,3 +20,6 @@ alias gco() { git checkout "$@" }
 alias gma() { git add . && git commit -m "$1" }
 alias gs() { git status }
 
+# move back to old cwd
+alias bk() { cd "$OLDPWD" }
+

zsh/.config/zsh/zsh-exports

@@ -6,6 +6,12 @@ HISTFILE=$ZDOTDIR/history
 # Allow useful scripts in ~/.bin to be in the search path.
 export PATH=~/.bin:$PATH
 
+# Add homebrew to the path
+if [ -d /opt/homebrew ]; then
+  export PATH=/opt/homebrew/bin:$PATH
+  export PATH=/opt/homebrew/sbin:$PATH
+fi
+
 # zsh-completions installed by homebrew
 if type brew &>/dev/null; then
  FPATH=$(brew --prefix)/share/zsh-completions:$FPATH
@@ -15,3 +21,4 @@ if type brew &>/dev/null; then
 fi
 
 export EDITOR="nvim"
+