Merge branch 'master' of github.com:cyplo/dotfiles
This commit is contained in:
commit
590106fba9
2 changed files with 10 additions and 45 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit 175b4a807383530aa75145b5b6fdedb3ce1f11f2
|
Subproject commit c78277fd8bda5fec87504469afdf121355876006
|
53
.zshrc
53
.zshrc
|
@ -1,65 +1,32 @@
|
||||||
# Path to your oh-my-zsh configuration.
|
|
||||||
ZSH=$HOME/.oh-my-zsh
|
ZSH=$HOME/.oh-my-zsh
|
||||||
|
|
||||||
# Set name of the theme to load.
|
|
||||||
# Look in ~/.oh-my-zsh/themes/
|
|
||||||
# Optionally, if you set this to "random", it'll load a random theme each
|
|
||||||
# time that oh-my-zsh is loaded.
|
|
||||||
ZSH_THEME="agnoster"
|
ZSH_THEME="agnoster"
|
||||||
|
|
||||||
# Example aliases
|
COMPLETION_WAITING_DOTS="true"
|
||||||
# alias zshconfig="mate ~/.zshrc"
|
|
||||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
|
||||||
|
|
||||||
# Set to this to use case-sensitive completion
|
plugins=(vi-mode svn git python history-substring-search)
|
||||||
# CASE_SENSITIVE="true"
|
|
||||||
|
|
||||||
# Uncomment this to disable bi-weekly auto-update checks
|
|
||||||
# DISABLE_AUTO_UPDATE="true"
|
|
||||||
|
|
||||||
# Uncomment to change how often before auto-updates occur? (in days)
|
|
||||||
# export UPDATE_ZSH_DAYS=13
|
|
||||||
|
|
||||||
# Uncomment following line if you want to disable colors in ls
|
|
||||||
# DISABLE_LS_COLORS="true"
|
|
||||||
|
|
||||||
# Uncomment following line if you want to disable autosetting terminal title.
|
|
||||||
# DISABLE_AUTO_TITLE="true"
|
|
||||||
|
|
||||||
# Uncomment following line if you want to disable command autocorrection
|
|
||||||
# DISABLE_CORRECTION="true"
|
|
||||||
|
|
||||||
# Uncomment following line if you want red dots to be displayed while waiting for completion
|
|
||||||
# COMPLETION_WAITING_DOTS="true"
|
|
||||||
|
|
||||||
# Uncomment 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"
|
|
||||||
|
|
||||||
# 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)
|
|
||||||
plugins=(git)
|
|
||||||
|
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
# Customize to your needs...
|
|
||||||
HISTFILE=~/.histfile
|
HISTFILE=~/.histfile
|
||||||
HISTSIZE=10240
|
HISTSIZE=10240
|
||||||
SAVEHIST=10240
|
SAVEHIST=10240
|
||||||
setopt appendhistory autocd extendedglob nomatch notify
|
setopt appendhistory autocd extendedglob nomatch notify
|
||||||
unsetopt beep
|
unsetopt beep
|
||||||
|
|
||||||
#vim bindings
|
|
||||||
bindkey -v
|
|
||||||
|
|
||||||
autoload -U compinit
|
autoload -U compinit
|
||||||
compinit
|
compinit
|
||||||
setopt completealiases
|
setopt completealiases
|
||||||
|
|
||||||
zstyle ':completion::complete:*' use-cache 1
|
zstyle ':completion::complete:*' use-cache 1
|
||||||
|
|
||||||
|
# bind UP and DOWN arrow keys
|
||||||
|
zmodload zsh/terminfo
|
||||||
|
bindkey "$terminfo[cuu1]" history-substring-search-up
|
||||||
|
bindkey "$terminfo[cud1]" history-substring-search-down
|
||||||
|
bindkey -M vicmd 'k' history-substring-search-up
|
||||||
|
bindkey -M vicmd 'j' history-substring-search-down
|
||||||
|
|
||||||
if [[ `uname` == 'Darwin' ]]; then
|
if [[ `uname` == 'Darwin' ]]; then
|
||||||
alias vim=/usr/local/Cellar/vim/7.4/bin/vim
|
alias vim=/usr/local/Cellar/vim/7.4/bin/vim
|
||||||
fi
|
fi
|
||||||
|
@ -76,5 +43,3 @@ export PATH=/usr/local/heroku/bin:$PATH
|
||||||
export EDITOR="vim"
|
export EDITOR="vim"
|
||||||
export KEYTIMEOUT=1
|
export KEYTIMEOUT=1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue