diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | zshenv (renamed from bashrc) | 29 | ||||
| -rw-r--r-- | zshrc | 23 |
3 files changed, 37 insertions, 21 deletions
diff --git a/Makefile b/Makefile index 39748df..a2dcf1b 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,13 @@ INTO = $(HOME) INSTALL = \ agignore \ aspell.en.pws \ - bashrc \ ctags \ emacs.d \ gitconfig \ gitignore \ - tmux.conf - + tmux.conf \ + zshenv \ + zshrc INSTALLED = $(patsubst %,$(INTO)/.%,$(INSTALL)) LN = @ln -sf diff --git a/bashrc b/zshenv index e73f17d..68c3eb3 100755..100644 --- a/bashrc +++ b/zshenv @@ -6,10 +6,16 @@ export PAGER="less" export TZ=America/Los_Angeles export GOPATH="${HOME}/workspace/go" -[ -z "$PS1" ] && return +export PROMPT="%/ %# " -# prompts -export PS1="\w % " +alias cp="cp -i" +alias l="ls" +alias la="ls -a" +alias ll="ls -lh" +alias lt="ls -lhtr" +alias mv="mv -i" +alias rm="rm -i" +alias add="arc diff --draft" # finally, build the path and source a few files __add_to_path_if_exists() { @@ -23,23 +29,10 @@ __source_file_if_exists() { __add_to_path_if_exists "${GOPATH}/bin" __add_to_path_if_exists "/opt/twitter/opt/go/libexec/bin" -__source_file_if_exists "/opt/google-cloud-sdk/path.bash.inc" -__source_file_if_exists "/opt/google-cloud-sdk/completion.bash.inc" -__source_file_if_exists "${HOME}/.bash_local" +__source_file_if_exists "/opt/google-cloud-sdk/path.zsh.inc" +__source_file_if_exists "/opt/google-cloud-sdk/completion.zsh.inc" # Twitter paths __add_to_path_if_exists "${HOME}/workspace/source/dist" __add_to_path_if_exists "/opt/twitter/bin" -alias cp="cp -i" -alias l="ls" -alias la="ls -a" -alias ll="ls -lh" -alias lt="ls -lhtr" -alias mv="mv -i" -alias rm="rm -i" -alias add="arc diff --draft" -alias tma="tmux attach || tmux" - -alias smf1pending='curl -s https://aurora-smf1.twitter.biz/pendingtasks | jq .' -alias atlapending='curl -s https://aurora-atla.twitter.biz/pendingtasks | jq .' diff --git a/zshrc b/zshrc new file mode 100644 index 0000000..2add721 --- /dev/null +++ b/zshrc @@ -0,0 +1,23 @@ +autoload -U compinit +compinit -C + +HISTFILE=~/.zhistory +HISTSIZE=5000 +SAVEHIST=5000 + +# Add commands to history as they are entered, don't wait for shell to exit +setopt INC_APPEND_HISTORY + +# Also remember command start time and duration +setopt EXTENDED_HISTORY + +# Do not keep duplicate commands in history +setopt HIST_IGNORE_ALL_DUPS + +# Do not remember commands that start with a whitespace +setopt HIST_IGNORE_SPACE + +zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' + +autoload -U select-word-style +select-word-style bash |