Compare commits

..

No commits in common. "f19bf41c63b4e5484b82eb243ea8325d7ae126ba" and "0ecc231c18371ed08b8e718a571a5cf6aef20659" have entirely different histories.

2 changed files with 12 additions and 31 deletions

3
zshenv
View File

@ -21,6 +21,9 @@ PATH=$HOME/.local/bin:$PATH
MANPATH=$HOME/.local/share/man:$MANPATH MANPATH=$HOME/.local/share/man:$MANPATH
INFOPATH=$HOME/.local/share/info:$INFOPATH INFOPATH=$HOME/.local/share/info:$INFOPATH
# Add ccache to the PATH if present
[ -f /usr/bin/ccache ] && PATH=/usr/lib/ccache:$PATH
# Use ~/.local for pip installs on macOS # Use ~/.local for pip installs on macOS
[ "`uname`" = "Darwin" ] && export PYTHONUSERBASE=$HOME/.local [ "`uname`" = "Darwin" ] && export PYTHONUSERBASE=$HOME/.local

34
zshrc
View File

@ -2,14 +2,10 @@
# executing commands, will be sourced when starting as an interactive shell. # executing commands, will be sourced when starting as an interactive shell.
# Load plugin scripts # Load plugin scripts
source-plugin() { plugin-load() { source ~/.config/zsh/$1/$1.plugin.zsh }
[ -d ~/.config/zsh/$1 ] && \ plugin-load zsh-autosuggestions
source ~/.config/zsh/$1/$1.plugin.zsh || \ plugin-load zsh-history-substring-search
echo "zsh plugin not found: $1" plugin-load zsh-syntax-highlighting
}
source-plugin zsh-autosuggestions
source-plugin zsh-history-substring-search
source-plugin zsh-syntax-highlighting
# Disable non end-of-line autosuggest accept widgets # Disable non end-of-line autosuggest accept widgets
ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(end-of-line vi-end-of-line) ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(end-of-line vi-end-of-line)
@ -121,39 +117,21 @@ typeset -U PATH
typeset -U MANPATH typeset -U MANPATH
typeset -U INFOPATH typeset -U INFOPATH
# Add ccache symlink directory to start of PATH, this must be after
# `typeset -U PATH` because on macOS this reorders the list so ccache's
# symlinks will no longer be at the start of PATH rendering it unusable.
if [ `uname` = Darwin ]; then
[ -f /usr/local/bin/ccache ] && \
PATH=/usr/local/opt/ccache/libexec:$PATH
else
[ -f /usr/bin/ccache ] && \
PATH=/usr/lib/ccache:$PATH
fi
# Aliases # Aliases
alias grep='grep --color=always' alias grep='grep --color=always'
which cmake &> /dev/null && \
alias cninja='cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMNADS=ON' alias cninja='cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMNADS=ON'
which ssh &> /dev/null && \
alias ssh='TERM=xterm-256color ssh' alias ssh='TERM=xterm-256color ssh'
case `uname` in case `uname` in
Linux) Linux)
[ "$TMUX" = "" ] && \ [ "$TMUX" = "" ] && \
alias cls="printf '\ec'" || \ alias cls="printf '\ec'" || alias cls="clear && printf '\e[3J'"
alias cls="clear && printf '\e[3J'"
alias ls='ls -F --color=auto' alias ls='ls -F --color=auto'
which cgdb &> /dev/null && \ alias debug='cgdb --args'
alias debug='cgdb --args' || \
which gdb &> /dev/null && \
alias debug='gdb --args'
;; ;;
Darwin) Darwin)
alias cls="clear && printf '\e[3J'" alias cls="clear && printf '\e[3J'"
alias ls='ls -GFh' alias ls='ls -GFh'
which lldb &> /dev/null && \
alias debug='lldb --' alias debug='lldb --'
;; ;;
esac esac