Permalink
Browse files

bash for server, zsh for local

  • Loading branch information...
1 parent 31a8aa3 commit b84b2a263e39e9d77967965fb04634c2a32450f4 Tyler Ball committed Mar 11, 2012
Showing with 14 additions and 41 deletions.
  1. +3 −0 _bash_aliases
  2. +8 −41 _profile
  3. +3 −0 _zshrc
View
@@ -0,0 +1,3 @@
+alias ll='ls -lh'
+alias la='ls -Alh'
+alias l='ls -CF'
View
@@ -1,9 +1,7 @@
# == [ .profile ] ================================================
-#
-# I keep all my paths and system-specifc variables in here
-#
-# ================================================================
+# if we're using bash, we're on a server
+export LOCATION='server'
# Set normal file creation permissions
umask 002
@@ -13,6 +11,10 @@ if [ -n "$BASH_VERSION" ]; then
if [ -f "$HOME/.bashrc" ]; then
. "$HOME/.bashrc"
fi
+
+ if [ -f "$HOME/.bash_aliases" ]; then
+ . "$HOME/.bash_aliases"
+ fi
fi
# Trapeze stuff
@@ -27,37 +29,8 @@ fi
fi
export SSHPROXY_USER="tball"
-# Include private bin
-[[ -d $HOME/bin ]] && export PATH="$HOME/bin:$PATH"
-
-# System-specifc paths
-# ====================
-
- # OS X
- if [[ "$(uname)" = "Darwin" ]]; then
- # gems on homebrew
- export GEM_HOME=`brew --prefix`
- export PATH='~/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/Cellar/ruby/1.9.2-p290/bin:$PATH'
-
- # Textmate as SVN editor
- export SVN_EDITOR=mate
-
- # Linux
- else
- export PATH='/usr/local/sbin:/usr/local/bin:~/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:~/.gem/ruby/1.8/bin:$PATH'
- fi
-
-# Python
-# ------
-
- # Pythonbrew on OS X
- [[ -s $HOME/.pythonbrew/etc/bashrc ]] && source $HOME/.pythonbrew/etc/bashrc
-
- # Source virtualenvwrapper on pythonbrew
- if [ -f $PATH_PYTHONBREW_CURRENT/virtualenvwrapper.sh ]; then
- export WORKON_HOME="$HOME/envs"
- source $PATH_PYTHONBREW_CURRENT/virtualenvwrapper.sh
- fi
+ # Include private bin
+ [[ -d $HOME/bin ]] && export PATH="$HOME/bin:$PATH"
# Source virtualenvwrapper on Linux
[[ -f /usr/local/bin/virtualenvwrapper.sh ]] && source /usr/local/bin/virtualenvwrapper.sh
@@ -74,9 +47,3 @@ fi
export PATH="$HOME/.npm:$PATH"
[[ -d "$HOME/local/node" ]] && export PATH="$HOME/local/node/bin:$PATH"
[[ -d "$HOME/local/node" ]] && export NODE_PATH="$HOME/local/node:$HOME/local/node/lib/node_modules"
-
-# Ruby
-# ----
-
- # RVM
- [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
View
@@ -7,6 +7,9 @@
VIRTUAL_ENV_DISABLE_PROMPT="YES"
+# if we're using zsh, were local
+export LOCATION='local'
+
# Set the key mapping style to 'emacs' or 'vi'.
zstyle ':omz:editor' keymap 'vi'

0 comments on commit b84b2a2

Please sign in to comment.