Skip to content

Commit

Permalink
Thu Jun 25 11:08:48 -03 2020
Browse files Browse the repository at this point in the history
  • Loading branch information
mtxr committed Jun 25, 2020
1 parent 7106c55 commit 3f19ccb
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 40 deletions.
15 changes: 0 additions & 15 deletions rcfiles/antibody-plugins.txt

This file was deleted.

2 changes: 0 additions & 2 deletions rcfiles/zsh/aliases.zsh
Expand Up @@ -5,8 +5,6 @@ unalias mv &>/dev/null
unalias grc &>/dev/null
unalias git &>/dev/null

alias git='hub' # uses hub cli

alias count="wc -l"

# Use colors in coreutils utilities output
Expand Down
22 changes: 1 addition & 21 deletions rcfiles/zsh/plugins_after.zsh
Expand Up @@ -9,17 +9,8 @@ fi
export ZSH_HIGHLIGHT_MAXLENGTH=100
export HISTORY_START_WITH_GLOBAL=true

if [ ! -f "$HOME/.zsh-plugins.sh" ] || \
[ ! -s "$HOME/.zsh-plugins.sh" ] || \
[ "$(( (`date +%s` - `date -r $HOME/.zsh-plugins.sh +%s`) / 86400 ))" -gt 5 ]
then
echo "Updating plugins..."
antibody bundle < $DOTFILES/rcfiles/antibody-plugins.txt > $HOME/.zsh-plugins.sh
antibody update
touch $HOME/.zsh-plugins.sh
fi

. $HOME/.zsh-plugins.sh
. $DOTFILES/rcfiles/zsh/zinit-plugins-load.zsh

# Remove conflicting keybindings
bindkey -r '^K'
Expand All @@ -29,17 +20,6 @@ bindkey -r '^T'
bindkey '^K^U' _mtxr-to-upper
bindkey '^K^L' _mtxr-to-lower

export SPACESHIP_PROMPT_ORDER=(
time
dir
# git
exec_time
line_sep
jobs
exit_code
char
)

autoload -U zcalc
function __calc_plugin {
zcalc -e "$*"
Expand Down
6 changes: 4 additions & 2 deletions rcfiles/zsh/plugins_before.zsh
Expand Up @@ -4,9 +4,11 @@ export WEB_INSTALLER=${WEB_INSTALLER:-$(type wget &> /dev/null && echo "wget -qO
##############################
# Antibody #
##############################
if ! type antibody &> /dev/null; then
eval $WEB_INSTALLER https://git.io/antibody | bash -s
if [ ! -d $HOME/.zinit/bin ]; then
mkdir -p $HOME/.zinit
git clone https://github.com/zdharma/zinit.git $HOME/.zinit/bin
fi
source $HOME/.zinit/bin/zinit.zsh

##############################
# Mtxr tools auto install #
Expand Down
20 changes: 20 additions & 0 deletions rcfiles/zsh/zinit-plugins-load.zsh
@@ -0,0 +1,20 @@
LOAD_TYPE= #light-mode

zinit ice compile'(pure|async).zsh' pick'async.zsh' src'pure.zsh'
zinit light sindresorhus/pure

zinit wait lucid for \
atinit"ZINIT[COMPINIT_OPTS]=-C; zicompinit; zicdreplay" zdharma/fast-syntax-highlighting \
blockf zsh-users/zsh-completions \
atload"!_zsh_autosuggest_start" zsh-users/zsh-autosuggestions

zinit for \
$LOAD_TYPE lukechilds/zsh-better-npm-completion \
$LOAD_TYPE mtxr/lwd \
$LOAD_TYPE mtxr/zsh-change-case \
$LOAD_TYPE djui/alias-tips \
$LOAD_TYPE caarlos0/ports \
$LOAD_TYPE zsh-users/zsh-history-substring-search \
$LOAD_TYPE mtxr/per-directory-history

zstyle :prompt:pure:git:stash show yes
1 change: 1 addition & 0 deletions rcfiles/zshenv
Expand Up @@ -64,6 +64,7 @@ setopt NOTIFY
setopt NULL_GLOB
setopt PROMPT_SUBST
setopt SHARE_HISTORY
setopt EXTENDEDGLOB

# Initialize completion
autoload -Uz compinit
Expand Down

0 comments on commit 3f19ccb

Please sign in to comment.