From 3480d37d508645df5996e608fe79b19d93302eb7 Mon Sep 17 00:00:00 2001 From: Alexander Karle Date: Tue, 15 May 2018 21:11:06 -0400 Subject: [PATCH] Moving zshrc to zsh folder --- install.sh | 2 +- zsh/zshrc | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ zshrc | 57 --------------------------------------------------------- 3 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 zsh/zshrc delete mode 100644 zshrc diff --git a/install.sh b/install.sh index 1fd0a96..6d0b1e8 100755 --- a/install.sh +++ b/install.sh @@ -114,7 +114,7 @@ success_msg "Clone successful! Putting you on your own branch '$(whoami)' so you # $HOME level ln's try_ln $DOTSVIM/vimrc $HOME/.vimrc try_ln $HOMEDOTS/tmux.conf $HOME/.tmux.conf -try_ln $HOMEDOTS/zshrc $HOME/.zshrc +try_ln $HOMEDOTS/zsh/zshrc $HOME/.zshrc for file in $HOMEDOTS/bash/*; do [ -e "$file" ] || continue diff --git a/zsh/zshrc b/zsh/zshrc new file mode 100644 index 0000000..c3f9b85 --- /dev/null +++ b/zsh/zshrc @@ -0,0 +1,57 @@ +# Path to your oh-my-zsh installation. +export ZSH=$HOME/.oh-my-zsh + +# zsh theme +ZSH_THEME="refined" + +# Zsh plugins ( Example format: plugins=(rails git textmate ruby lighthouse) ) +# note: zsh-syntax must be last! +plugins=(git zsh-syntax-highlighting docker) + +source $ZSH/oh-my-zsh.sh + +export DEFAULT_USER="$(whoami)" + +# prevent zsh from renaming tmux windows +DISABLE_AUTO_TITLE="true" + +# export editor for tmuxinator +export EDITOR="vim" + +# 10ms for key sequences +KEYTIMEOUT=1 + +# vi keymap in terminal +bindkey -v + +# backspace works past insert mode location +bindkey '^?' backward-delete-char + +# ctrl-r starts searching history backward +bindkey '^r' history-incremental-search-backward + +# Indicate vi mode! +source ~/.akarledots/zsh/vi_prompt_append.zsh + +# alias for homebrew versions of things +# alias ctags='/usr/local/Cellar/ctags/5.8_1/bin/ctags' +# alias python python2 + +# other alias' +# alias pgp='open -a "PariGP"' +# alias vim='nvim' +alias dps="docker ps -a" + +# ITALICS UPDATE: may break ssh? +if [ $TERM = 'xterm-256color-italic' ]; then + alias ssh="TERM='xterm-256color' ssh" + alias vsh="TERM='xterm-256color' vagrant ssh" +else + alias vsh="vagrant ssh" +fi + +alias vsus="vagrant suspend" +alias vup="vagrant up" + +# cd to a parent directory +function pcd { cd ${PWD%/$1/*}/$1; } diff --git a/zshrc b/zshrc deleted file mode 100644 index c3f9b85..0000000 --- a/zshrc +++ /dev/null @@ -1,57 +0,0 @@ -# Path to your oh-my-zsh installation. -export ZSH=$HOME/.oh-my-zsh - -# zsh theme -ZSH_THEME="refined" - -# Zsh plugins ( Example format: plugins=(rails git textmate ruby lighthouse) ) -# note: zsh-syntax must be last! -plugins=(git zsh-syntax-highlighting docker) - -source $ZSH/oh-my-zsh.sh - -export DEFAULT_USER="$(whoami)" - -# prevent zsh from renaming tmux windows -DISABLE_AUTO_TITLE="true" - -# export editor for tmuxinator -export EDITOR="vim" - -# 10ms for key sequences -KEYTIMEOUT=1 - -# vi keymap in terminal -bindkey -v - -# backspace works past insert mode location -bindkey '^?' backward-delete-char - -# ctrl-r starts searching history backward -bindkey '^r' history-incremental-search-backward - -# Indicate vi mode! -source ~/.akarledots/zsh/vi_prompt_append.zsh - -# alias for homebrew versions of things -# alias ctags='/usr/local/Cellar/ctags/5.8_1/bin/ctags' -# alias python python2 - -# other alias' -# alias pgp='open -a "PariGP"' -# alias vim='nvim' -alias dps="docker ps -a" - -# ITALICS UPDATE: may break ssh? -if [ $TERM = 'xterm-256color-italic' ]; then - alias ssh="TERM='xterm-256color' ssh" - alias vsh="TERM='xterm-256color' vagrant ssh" -else - alias vsh="vagrant ssh" -fi - -alias vsus="vagrant suspend" -alias vup="vagrant up" - -# cd to a parent directory -function pcd { cd ${PWD%/$1/*}/$1; } -- libgit2 0.28.4