diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | aliases | 35 | ||||
| -rw-r--r-- | docs/zsh.org | 21 | ||||
| -rw-r--r-- | env | 9 | ||||
| -rw-r--r-- | zprofile | 20 | ||||
| -rw-r--r-- | zshrc | 33 |
6 files changed, 5 insertions, 122 deletions
diff --git a/Makefile b/Makefile index af15df7..a309f2f 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,15 @@ INTO = $(HOME) INSTALL = \ - aliases \ + bashrc \ + bash_login \ + bash_logout \ aspell.en.pws \ emacs.d \ gitconfig \ gitignore \ - tmux.conf \ - zprofile \ - zshrc + tmux.conf + git: git config --local user.email "franckcuny@gmail.com" diff --git a/aliases b/aliases deleted file mode 100644 index 4d469b1..0000000 --- a/aliases +++ /dev/null @@ -1,35 +0,0 @@ -# some aliases -if [[ "${OSTYPE}" =~ "darwin" ]]; then - alias ls='ls -G' -else - alias ls='ls --color' -fi - -# editor -alias e="$EDITOR" -alias et="TERM=xterm-256color emacsclient -nw" - -# generic commands -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 utc="date -u" - -# tools -alias tmuxa="tmux new-session -A -s work" -alias grep="grep --color=auto" -alias camera-backup="pbackup --bucket fcuny-photos --project fcuny-backups --import-path /Volumes/a6000/DCIM/100MSDCF/" -alias k="kubectl" - -# git -alias g="git" -alias gclean="git clean -dfx" - -# zsh stuff -alias zshrc="source ~/.zshrc" - -alias ohwell="docker-machine restart default" diff --git a/docs/zsh.org b/docs/zsh.org deleted file mode 100644 index 5a34193..0000000 --- a/docs/zsh.org +++ /dev/null @@ -1,21 +0,0 @@ -#+AUTHOR: Franck Cuny -#+TITLE: zsh documentation -#+STARTUP: indent -#+STARTUP: hidestars - -The configuration files are loaded in that order: - -+ /etc/zshenc -+ $HOME/.zshenv -+ /etc/zprofile -+ $HOME/.zprofile -+ /etc/zshrc -+ $HOME/.zshrc -+ /etc/zlogin (if login shell) -+ $HOME/.zlogin (if login shell) - -** Tips -/etc/zshenv is run for all instances of zsh, it is important that it be kept as small as possible. - -** On OS X -On OS X, terminal emulators are starting every shell as a login shells (since OS X doesn't source the profile). diff --git a/env b/env deleted file mode 100644 index c840045..0000000 --- a/env +++ /dev/null @@ -1,9 +0,0 @@ -export EDITOR="emacsclient -a ''" -export HISTFILE= -export LANG="en_US.UTF-8" -export LC_ALL="$LANG" -export LC_CTYPE="$LANG" -export PAGER="less" -export TMPDIR="${HOME}/tmp" -export TZ=America/Los_Angeles -export GOPATH="${HOME}" diff --git a/zprofile b/zprofile deleted file mode 100644 index 3843e85..0000000 --- a/zprofile +++ /dev/null @@ -1,20 +0,0 @@ -export EDITOR="emacsclient -a ''" -export HISTFILE= -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}/gocode" - -# build the PATH -path=( - "$HOME/bin" - "$HOME/gocode/bin" - "$HOME/src/source/dist" - "/opt/twitter/bin" - "/opt/twitter/opt/go/libexec/bin" - "/Applications/Racket v6.3/bin/" - $path -) - diff --git a/zshrc b/zshrc deleted file mode 100644 index 400cb2a..0000000 --- a/zshrc +++ /dev/null @@ -1,33 +0,0 @@ -# This is for the interactive shell - -# enable colors -autoload -U colors -colors - -# enable auto completion -autoload -U compinit -compinit -C -zstyle ':completion:*' completer _expand _complete _match _prefix - -# I want word boundary to be similar to bash -autoload -U select-word-style -select-word-style bash - -# keep the prompt simple and short -PROMPT="%3~ %# " - -# emacs style -bindkey -e - -# load custom aliases -source ~/.aliases - -# aliases for some directories -hash -d s="$HOME/src/source" -hash -d eb="$HOME/src/source/eventbus" -hash -d ops="$HOME/src/twitter-ops/" -hash -d science="$HOME/src/source/science/" -hash -d gcode="$HOME/gocode/src/" - -# this is for local stuff -[ -f ~/.zlogin_local ] && source ~/.zlogin_local |