From d87b901c5e7cc7c78109b51da64ffa78cd6e8f15 Mon Sep 17 00:00:00 2001
From: Franck Cuny <fcuny@twitter.com>
Date: Wed, 12 Jun 2019 16:14:57 -0700
Subject: [zsh] replace bash with zsh

In the next version of OS X, zsh will become the default shell.
---
 Makefile |  6 +++---
 bashrc   | 45 ---------------------------------------------
 zshenv   | 38 ++++++++++++++++++++++++++++++++++++++
 zshrc    | 23 +++++++++++++++++++++++
 4 files changed, 64 insertions(+), 48 deletions(-)
 delete mode 100755 bashrc
 create mode 100644 zshenv
 create mode 100644 zshrc

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/bashrc
deleted file mode 100755
index e73f17d..0000000
--- a/bashrc
+++ /dev/null
@@ -1,45 +0,0 @@
-export EDITOR="emacsclient -nw"
-export LANG="en_US.UTF-8"
-export LC_ALL="$LANG"
-export LC_CTYPE="$LANG"
-export PAGER="less"
-export TZ=America/Los_Angeles
-export GOPATH="${HOME}/workspace/go"
-
-[ -z "$PS1" ] && return
-
-# prompts
-export PS1="\w % "
-
-# finally, build the path and source a few files
-__add_to_path_if_exists() {
-  [ -d "$1" ] && export PATH="$1:$PATH"
-}
-
-__source_file_if_exists() {
-  [ -s "$1" ] && source "$1"
-}
-
-__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"
-
-# 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/zshenv b/zshenv
new file mode 100644
index 0000000..68c3eb3
--- /dev/null
+++ b/zshenv
@@ -0,0 +1,38 @@
+export EDITOR="emacsclient -nw"
+export LANG="en_US.UTF-8"
+export LC_ALL="$LANG"
+export LC_CTYPE="$LANG"
+export PAGER="less"
+export TZ=America/Los_Angeles
+export GOPATH="${HOME}/workspace/go"
+
+export PROMPT="%/ %# "
+
+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() {
+  [ -d "$1" ] && export PATH="$1:$PATH"
+}
+
+__source_file_if_exists() {
+  [ -s "$1" ] && source "$1"
+}
+
+__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.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"
+
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
-- 
cgit v1.2.3