Moving from oh-my-zsh to antigen

This commit is contained in:
Elijah Lazkani 2017-03-06 19:20:33 -05:00
parent d38f917bf4
commit fb57028707
2 changed files with 51 additions and 75 deletions

View file

@ -1,66 +1,47 @@
# If you come from bash you might have to change your $PATH.
export PATH=$HOME/bin:/usr/local/bin:/usr/local/sbin:$PATH
# Path to your oh-my-zsh installation.
export ZSH={{ grains.homedir }}/.oh-my-zsh
# Set name of the theme to load. Optionally, if you set this to "random"
# it'll load a random theme each time that oh-my-zsh is loaded.
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
ZSH_THEME="agnoster"
# Uncomment the following line to use case-sensitive completion.
# CASE_SENSITIVE="true"
# Uncomment the following line to use hyphen-insensitive completion. Case
# sensitive completion must be off. _ and - will be interchangeable.
# HYPHEN_INSENSITIVE="true"
# Uncomment the following line to disable bi-weekly auto-update checks.
# DISABLE_AUTO_UPDATE="true"
# Uncomment the following line to change how often to auto-update (in days).
export UPDATE_ZSH_DAYS=7
# Uncomment the following line to disable colors in ls.
# DISABLE_LS_COLORS="true"
# Uncomment the following line to disable auto-setting terminal title.
# DISABLE_AUTO_TITLE="true"
# Uncomment the following line to enable command auto-correction.
ENABLE_CORRECTION="true"
# Uncomment the following line to display red dots whilst waiting for completion.
COMPLETION_WAITING_DOTS="true"
# Uncomment the following line if you want to disable marking untracked files
# under VCS as dirty. This makes repository status check for large repositories
# much, much faster.
# DISABLE_UNTRACKED_FILES_DIRTY="true"
# Uncomment the following line if you want to change the command execution time
# stamp shown in the history command output.
# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
HIST_STAMPS="yyyy-mm-dd"
# Would you like to use another custom folder than $ZSH/custom?
# ZSH_CUSTOM=/path/to/new-custom-folder
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
{% if grains['kernel'] == 'Darwin' -%}
plugins=(gitignore osx brew python zsh_reload)
{% elif grains['kernel'] == 'Linux' %}
plugins=(gitignore python zsh_reload)
{%- endif %}
source $ZSH/oh-my-zsh.sh
# Source antigen
source {{ grains.homedir }}/antigen/antigen.zsh
# Source bashrc
source $HOME/.bashrc
source {{ grains.homedir }}/.bashrc
# Load the oh-my-zsh's library.
antigen use oh-my-zsh
# Bundles from the default repo (robbyrussell's oh-my-zsh).
antigen bundle git
antigen bundle pip
antigen bundle python
antigen bundle gitignore
antigen bundle zsh_reload
antigen bundle command-not-found
antigen bundle Tarrasch/zsh-autoenv
antigen bundle unixorn/warhol.plugin.zsh
# Autogenerate OS specific
{% if grains['kernel'] == 'Darwin' -%}
antigen bundle osx
antigen bundle brew
{% elif grains['kernel'] == 'Linux' %}
antigen bundle colored-man-pages
{%- endif %}
# syntax highlighting bundle.
antigen bundle zsh-users/zsh-syntax-highlighting
# syntax highlighting bundle.
antigen bundle zsh-users/zsh-autosuggestions
# Load the theme.
antigen theme robbyrussell
# Tell antigen that you're done.
antigen apply
# Alias
alias ls='grc -s ls'
# If you come from bash you might have to change your $PATH.
export PATH=$HOME/bin:/usr/local/bin:/usr/local/sbin:$PATH
# User configuration
@ -82,16 +63,3 @@ fi
# ssh
# export SSH_KEY_PATH="~/.ssh/dsa_id"
export SSH_KEY_PATH="~/.ssh/id_rsa"
# Fix the auto-correct of commands that have a dotfile
unsetopt correct_all
setopt correct
# Set personal aliases, overriding those provided by oh-my-zsh libs,
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
# For a full list of active aliases, run `alias`.
#
# Example aliases
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"

View file

@ -23,6 +23,14 @@ oh-my-zshell:
- name: https://github.com/robbyrussell/oh-my-zsh.git
- target: {{ grains.homedir }}/.oh-my-zsh
- user: {{ grains.user }}
- group: {{ grains.group }}
antigen:
git.latest:
- name: https://github.com/zsh-users/antigen.git
- target: {{ grains.homedir }}/antigen
- user: {{ grains.user }}
- group: {{ grains.group }}
{{ grains.user }}:
user.present: