alanorth/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1 from alanorth/cross-platform-cleanups

Browse Source 
Cross platform cleanups
This commit is contained in:
Alan Orth 2015-05-05 11:44:36 +03:00
commit e871929aa0
2 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.tmux.conf
View File

@ -107,6 +107,8 @@ set-option -g history-limit 4096
# http://tmux.svn.sourceforge.net/viewvc/tmux/trunk/FAQ # http://tmux.svn.sourceforge.net/viewvc/tmux/trunk/FAQ
set-option -g default-terminal "screen-256color" set-option -g default-terminal "screen-256color"
set -g default-command "${SHELL}"
#### COLOUR (Solarized dark) #### COLOUR (Solarized dark)
# default statusbar colors # default statusbar colors

49
.zshrc
View File

@ -20,24 +20,47 @@ compinit
# OS-specific things # OS-specific things
if [[ "$OSTYPE" =~ ^darwin.*$ ]]; then if [[ "$OSTYPE" =~ ^darwin.*$ ]]; then
PATH=$(brew --prefix coreutils)/libexec/gnubin:/usr/local/sbin:$PATH # set pkgsrc paths
# see: http://pkgsrc.joyent.com/install-on-osx/
PATH=/usr/pkg/sbin:/usr/pkg/bin:$PATH
MANPATH=/usr/pkg/man:$MANPATH
if [[ -f $(brew --prefix)/etc/bash_completion ]]; then # use pkgsrc's GNU coreutils (prefixed with 'g')
. $(brew --prefix)/etc/bash_completion # requires at least: coreutils findutils gsed
fi alias du='gdu'
fi alias ls='gls -F --color=auto'
alias df='gdf'
alias rm='grm'
alias cp='gcp'
alias mv='gmv'
alias mkdir='gmkdir'
alias rmdir='grmdir'
alias chmod='gchmod'
alias chown='gchown'
alias ln='gln'
alias find='gfind'
alias less='gless -R' # preserves colors
alias sed='gsed'
# Aliases # solarized dircolors (needs coreutils from pkgsrc)
[[ -r ~/.dircolors.ansi-dark ]] && eval `gdircolors ~/.dircolors.ansi-dark`
elif [[ "$OSTYPE" =~ ^linux*$ ]]; then
# aliases
alias ls='ls -F --color=auto' alias ls='ls -F --color=auto'
alias less='less -R' # preserves colors in GNU coreutils' `less` alias less='less -R' # preserves colors in GNU coreutils' `less`
# solarized dircolors
[[ -r ~/.dircolors.ansi-dark ]] && eval `dircolors ~/.dircolors.ansi-dark`
fi
# Environment # Environment
export PS1='[%n@%m: %~]$ ' export PS1='[%n@%m: %~]$ '
export EDITOR=/usr/bin/vim export EDITOR=vim
export PAGER=/usr/bin/less export PAGER=less
# look for Ansible hosts file in current directory # look for Ansible hosts file in current directory
export ANSIBLE_HOSTS=hosts export ANSIBLE_INVENTORY=hosts
# look for Node binaries in current directory # look for Node binaries in current directory
# if we have npm, we probably want to use npm binaries # if we have npm, we probably want to use npm binaries
@ -45,14 +68,14 @@ export ANSIBLE_HOSTS=hosts
# node modules' bin to PATH # node modules' bin to PATH
command -v npm >/dev/null 2>&1 command -v npm >/dev/null 2>&1
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
export PATH=$PATH:node_modules/.bin PATH=$PATH:node_modules/.bin
fi fi
# Enable pyenv # Enable pyenv
# See: https://github.com/yyuu/pyenv#basic-github-checkout # See: https://github.com/yyuu/pyenv#basic-github-checkout
if [[ -d ~/.pyenv ]]; then if [[ -d ~/.pyenv ]]; then
export PYENV_ROOT="$HOME/.pyenv" export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH" PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)" eval "$(pyenv init -)"
# optionally enable pyenv-virtualenv # optionally enable pyenv-virtualenv
@ -65,7 +88,5 @@ fi
# If a private bin directory exists, add it to PATH # If a private bin directory exists, add it to PATH
[[ -d ~/bin ]] && PATH="$PATH:~/bin" [[ -d ~/bin ]] && PATH="$PATH:~/bin"
# solarized dircolors (needs coreutils from homebrew on Mac OS X)
[[ -r ~/.dircolors.ansi-dark ]] && eval `dircolors ~/.dircolors.ansi-dark`
export PATH export PATH
export MANPATH