Merge remote-tracking branch 'Jidbo/master'
This commit is contained in:
saibotk
commit
f4a141e7ce
1 changed files with 15 additions and 88 deletions
103
.zshrc
103
.zshrc
|
|
@ -1,62 +1,9 @@
|
||||||
# If you come from bash you might have to change your $PATH.
|
|
||||||
# export PATH=$HOME/bin:/usr/local/bin:$PATH
|
|
||||||
# Path to your oh-my-zsh installation.
|
# Path to your oh-my-zsh installation.
|
||||||
export ZSH="$HOME/.oh-my-zsh"
|
export ZSH="$HOME/.oh-my-zsh"
|
||||||
|
|
||||||
# Set name of the theme to load. Optionally, if you set this to "random"
|
ZSH_THEME="robbyrussell"
|
||||||
# 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"
|
|
||||||
|
|
||||||
# Set list of themes to load
|
# plugins
|
||||||
# Setting this variable when ZSH_THEME=random
|
|
||||||
# cause zsh load theme from this variable instead of
|
|
||||||
# looking in ~/.oh-my-zsh/themes/
|
|
||||||
# An empty array have no effect
|
|
||||||
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "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=13
|
|
||||||
|
|
||||||
# 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="mm/dd/yyyy"
|
|
||||||
|
|
||||||
# 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.
|
|
||||||
plugins=(
|
plugins=(
|
||||||
git
|
git
|
||||||
pip
|
pip
|
||||||
|
|
@ -73,37 +20,16 @@ source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
# User configuration
|
# User configuration
|
||||||
|
|
||||||
# export MANPATH="/usr/local/man:$MANPATH"
|
# Helper Functions
|
||||||
|
# Returns whether the given command is executable or aliased.
|
||||||
# You may need to manually set your language environment
|
_has() {
|
||||||
# export LANG=en_US.UTF-8
|
return $( whence $1 >/dev/null )
|
||||||
|
}
|
||||||
# Preferred editor for local and remote sessions
|
|
||||||
# if [[ -n $SSH_CONNECTION ]]; then
|
|
||||||
# export EDITOR='vim'
|
|
||||||
# else
|
|
||||||
# export EDITOR='mvim'
|
|
||||||
# fi
|
|
||||||
|
|
||||||
# Compilation flags
|
|
||||||
# export ARCHFLAGS="-arch x86_64"
|
|
||||||
|
|
||||||
# ssh
|
|
||||||
# export SSH_KEY_PATH="~/.ssh/rsa_id"
|
|
||||||
|
|
||||||
# Set vim as default editor
|
# Set vim as default editor
|
||||||
export EDITOR='vim'
|
export EDITOR='vim'
|
||||||
|
|
||||||
# Set personal aliases, overriding those provided by oh-my-zsh libs,
|
# aliases
|
||||||
# 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"
|
|
||||||
|
|
||||||
# Custom aliases
|
|
||||||
alias ll='ls -l'
|
alias ll='ls -l'
|
||||||
alias vi='vim'
|
alias vi='vim'
|
||||||
alias la='ls -la'
|
alias la='ls -la'
|
||||||
|
|
@ -112,14 +38,15 @@ if [ -f ~/.dotfiles/.localcommands ]; then
|
||||||
source ~/.dotfiles/.localcommands
|
source ~/.dotfiles/.localcommands
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Antigen
|
|
||||||
#if [ -f ~/.dotfiles/antigen.zsh ]; then
|
|
||||||
# source ~/.dotfiles/antigen.zsh
|
|
||||||
#fi
|
|
||||||
|
|
||||||
# Tmuxinator autocomplete
|
# Tmuxinator autocomplete
|
||||||
if [ -f ~/.bin/tmuxinator.zsh ]; then
|
if [ -f ~/.bin/tmuxinator.zsh ]; then
|
||||||
source ~/.bin/tmuxinator.zsh
|
source ~/.bin/tmuxinator.zsh
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# fzf + ag configuration
|
||||||
|
if _has fzf && _has ag; then
|
||||||
|
export FZF_CTRL_T_COMMAND='ag --hidden --nocolor --ignore .git -g ""'
|
||||||
|
export FZF_ALT_C_COMMAND='find . -type d'
|
||||||
|
fi
|
||||||
|
|
||||||
export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin"
|
export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue