From 4badfcbffd15ddfef6c244d19f8bd437082b29f5 Mon Sep 17 00:00:00 2001 From: odrling Date: Sat, 29 Dec 2018 19:14:14 +0100 Subject: [PATCH] switch to antibody --- .antibody/plugins | 10 ++++++++++ .gitignore | 2 ++ .zshrc | 42 ++++++++++++++---------------------------- 3 files changed, 26 insertions(+), 28 deletions(-) create mode 100644 .antibody/plugins diff --git a/.antibody/plugins b/.antibody/plugins new file mode 100644 index 0000000..9a7f504 --- /dev/null +++ b/.antibody/plugins @@ -0,0 +1,10 @@ + +robbyrussell/oh-my-zsh path:lib/spectrum.zsh +robbyrussell/oh-my-zsh path:plugins/pass +robbyrussell/oh-my-zsh path:plugins/ssh-agent +robbyrussell/oh-my-zsh path:plugins/adb + +zsh-users/zsh-autosuggestions +zsh-users/zsh-completions +zsh-users/zsh-syntax-highlighting + diff --git a/.gitignore b/.gitignore index 503a3ef..fdf02a7 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ Cache !/.local/bin /.local/share +# ignore antibody +!/.antibody/plugins diff --git a/.zshrc b/.zshrc index a32b24f..f2defb3 100644 --- a/.zshrc +++ b/.zshrc @@ -1,28 +1,13 @@ -mkdir -p ~/.antigen - -if [ ! -f ~/.antigen/antigen.zsh ]; then - curl -Ls git.io/antigen > ~/.antigen/antigen.zsh +if ! which antibody > /dev/null 2>1; then + echo "installing antibody" + curl -sL git.io/antibody | sh -s fi -source ~/.antigen/antigen.zsh +[ ! -f ~/.antibody/plugins.sh ] && antibody bundle < ~/.antibody/plugins > ~/.antibody/plugins.sh -antigen use oh-my-zsh - -antigen bundle git -antigen bundle pip -antigen bundle command-not-found -antigen bundle pass -#antigen bundle ssh-agent - -antigen bundle zsh-users/zsh-syntax-highlighting -antigen bundle zsh-users/zsh-autosuggestions -antigen bundle zsh-users/zsh-completions -antigen bundle chrissicool/zsh-bash - -antigen theme gentoo - -antigen apply +[ -f ~/.bash.command-not-found ] && source ~/.bash.command-not-found +source ~/.antibody/plugins.sh zstyle ':completion:*' completer _expand _complete _ignored _correct _approximate zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'r:|[._-]=** r:|=**' @@ -42,10 +27,7 @@ zstyle ':completion:*' rehash true done } -autoload -Uz compinit promptinit -compinit -promptinit -#; prompt gentoo +autoload -Uz compinit && compinit zstyle ':completion::complete:*' use-cache 1 # End of lines added by compinstall @@ -59,13 +41,17 @@ bindkey -e # End of lines configured by zsh-newuser-install export PATH="$HOME/.local/bin:$PATH" + +# Prompt +autoload -U colors && colors +PROMPT="%B%{$FG[081]%}%n%{$reset_color%}%b%{$FG[245]%}@%{$reset_color%}%B%{$FG[206]%}%m%{$reset_color%}%b %{$fg[245]%}%B%c%b %(!.%{$FG[001]%}#.%{$FG[081]%}$)%{$reset_color%} " + export EDITOR=vim #export TERM="xterm" alias sshmoethyst="ssh -t amoethyst '~/.local/bin/tmux-session'" alias venv="source ~/.venv/bin/activate" alias dots="git --git-dir=$HOME/.dots --work-tree=$HOME" -alias mstream="mpv --no-resume-playback" -alias mpodcast="mpv --no-video" -alias grep="ag" alias top="htop" +alias dotmodules="dots submodule update --recursive --remote" +alias ytdl="youtube-dl"