Compare commits

..

No commits in common. "ff8d4a638d7cd7151e461404c59bb88445b63aae" and "f623cf394253b8f3f61aa3b70d63e3015644e63f" have entirely different histories.

3 changed files with 19 additions and 12 deletions

View File

@ -13,8 +13,7 @@ fi
# Better exa # Better exa
if [[ -x $(which exa) ]]; then if [[ -x $(which exa) ]]; then
alias exa='pwd; exa --long --all --all --group-directories-first --git --group' alias exa='pwd; exa -la --group-directories-first --git -g'
# --all (2x) to show `.` and `..` directories as well
fi fi
# Better lsd # Better lsd

20
zsh/env
View File

@ -49,13 +49,14 @@ fi
# Add syncthing synced binary folder to $PATH # Add syncthing synced binary folder to $PATH
if [[ $platform == 'macOS' ]]; then if [[ $platform == 'macOS' ]]; then
export PATH="$HOME/SyncMac/Apps/bin/universal:$PATH"
export PATH="$HOME/SyncMac/Apps/bin/x86_64_rosetta2:$PATH"
if [[ $arch == 'arm' ]]; then if [[ $arch == 'arm' ]]; then
export PATH="$HOME/SyncMac/Apps/bin/arm64:$PATH" export PATH="$HOME/SyncMac/Apps/bin/arm64:$PATH"
export PATH="$HOME/SyncMac/Apps/bin/universal:$PATH"
export PATH="$HOME/SyncMac/Apps/bin/x86_64_rosetta2:$PATH"
elif [[ $arch == 'i386' ]]; then elif [[ $arch == 'i386' ]]; then
export PATH="$HOME/SyncMac/Apps/bin/universal:$PATH"
export PATH="$HOME/SyncMac/Apps/bin/x86_64:$PATH" export PATH="$HOME/SyncMac/Apps/bin/x86_64:$PATH"
export PATH="$HOME/SyncMac/Apps/bin/x86_64_rosetta2:$PATH"
fi fi
fi fi
@ -79,10 +80,11 @@ fi
# evals # evals
# #
# Replace default `thefuck` eval with suggestion from GitHub # TheFuck
# https://github.com/nvbn/thefuck/issues/859 if [[ -x $(which thefuck) ]]; then
if command -v thefuck >/dev/null 2>&1; then eval "$(thefuck --alias)"
fuck() { # You can use whatever you want as an alias, like for Mondays:
eval "$(thefuck --alias)" && fuck eval "$(thefuck --alias FUCK)"
}
alias fuck='eval $(thefuck $(fc -ln -1 | tail -n 1)); fc -R'
fi fi

6
zshrc
View File

@ -57,3 +57,9 @@ if [[ -d $HOME/.jan ]]; then
source "$HOME/.jan/credentials" source "$HOME/.jan/credentials"
source "$HOME/.jan/zsh_options" source "$HOME/.jan/zsh_options"
fi fi
PATH="/Users/jan/perl5/bin${PATH:+:${PATH}}"; export PATH;
PERL5LIB="/Users/jan/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
PERL_LOCAL_LIB_ROOT="/Users/jan/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
PERL_MB_OPT="--install_base \"/Users/jan/perl5\""; export PERL_MB_OPT;
PERL_MM_OPT="INSTALL_BASE=/Users/jan/perl5"; export PERL_MM_OPT;