Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
Commits on Feb 28, 2012
jeremy Fix tmux.config on systems other than OS X (copy/paste)
Also moved non-zsh specific stuff from zsh/config to shared so bash
works better.
628a59f
jeremy Merge remote-tracking branch 'origin/master' 7921440
Showing with 83 additions and 68 deletions.
  1. +2 −2 bash_profile
  2. +12 −0 bin/tmux-shell
  3. +48 −5 shared
  4. +1 −1 tmux.conf
  5. +16 −59 zsh/config
  6. +4 −1 zshrc
View
4 bash_profile
@@ -1,8 +1,8 @@
DOTFILES=~/dotfiles
+source $DOTFILES/shared
+
source $DOTFILES/bash/aliases
source $DOTFILES/bash/completions
source $DOTFILES/bash/paths
source $DOTFILES/bash/config
-
-source $DOTFILES/shared
View
12 bin/tmux-shell
@@ -0,0 +1,12 @@
+#!/usr/bin/env zsh
+# If anyone happens to looks at this and knows of a beter
+# way, let me know. Thanks!
+
+case `uname` in
+ (Darwin)
+ `reattach-to-user-namespace -l zsh`
+ ;;
+ (*)
+ `zsh`
+ ;;
+esac
View
53 shared
@@ -1,9 +1,52 @@
+##
+# Determine whether or not some programs
+# are installed.
+##
+which emacsclient > /dev/null
+emacsclient_installed=$?
+
+# Sometimes I'm on a server that doesn't have git
+# installed so I curl the dotfiles tarball. Check
+# so things that depend on git can be disabled.
+which git > /dev/null
+git_installed=$?
+
+##
+# rbenv
+##
if [[ -a "$HOME/.rbenv/shims" ]]; then
- PATH="$HOME/.rbenv/shims:$HOME/.rbenv/bin:$PATH"
+ PATH="$HOME/.rbenv/shims:$HOME/.rbenv/bin:$PATH"
fi
-export PATH="$DOTFILES/bin:$PATH"
-export NODE_PATH="/usr/local/lib/node_modules"
+##
+# Platform specific
+##
+case `uname` in
+ (Darwin)
+ export JAVA_HOME='/Library/Java/Home'
-[[ -f ~/dotfiles-home/zshrc ]] && . ~/dotfiles-home/zshrc
-[[ -f ~/dotfiles-work/zshrc ]] && . ~/dotfiles-work/zshrc
+ EDITOR='emacsclient --alternate-editor=mate'
+ ;;
+ (SunOS)
+ export TERM='xterm'
+ ;;
+ (*)
+ EDITOR='vim'
+ if [ $emacsclient_installed -eq 0 ]; then
+ EDITOR="emacsclient --alternate-editor=vim"
+ fi
+ ;;
+esac
+
+export EDITOR
+export SVN_EDITOR=$EDITOR
+export GIT_EDITOR=$EDITOR
+
+export PATH="$DOTFILES/bin:/usr/local/bin:/usr/local/sbin:$PATH"
+export MANPATH="/usr/local/man:/usr/local/git/man:$MANPATH"
+export DEV_PATH="$HOME/dev"
+export HOME_DEV_PATH="$HOME/dev/h"
+export WORK_DEV_PATH="$HOME/dev/w"
+export OSS_DEV_PATH="$HOME/dev/oss"
+export CDPATH=":$WORK_DEV_PATH:$HOME_DEV_PATH:$OSS_DEV_PATH:$DEV_PATH:$HOME:$CDPATH"
+export NODE_PATH="/usr/local/lib/node_modules"
View
2 tmux.conf
@@ -1,6 +1,6 @@
set -g prefix C-j
-set-option -g default-command 'reattach-to-user-namespace -l zsh'
+set-option -g default-command 'tmux-shell'
bind-key C-j last-window
View
75 zsh/config
@@ -1,30 +1,13 @@
fpath=($DOTFILES/zsh/functions $fpath)
autoload -U $DOTFILES/zsh/functions/*(:t)
-autoload -U promptinit
-promptinit
-
##
# Initialize colors
##
autoload -U colors
colors
##
-# Determine whether or not some programs
-# are installed.
-##
-
-which emacsclient > /dev/null
-emacsclient_installed=$?
-
-# Sometimes I'm on a server that doesn't have git
-# installed so I curl the dotfiles tarball. Check
-# so things that depend on git can be disabled.
-which git > /dev/null
-git_installed=$?
-
-##
# Prompt
##
HOSTNAME_LABEL="%B%F{green}%n@%m%f"
@@ -44,61 +27,35 @@ export PROMPT="$PROMPT
%B%F{yellow}%#%b%f "
##
-# Platform specific
+# Options
##
-case `uname` in
- (Darwin)
- export JAVA_HOME='/Library/Java/Home'
- export EDITOR='emacsclient --alternate-editor=mate'
- ;;
- (SunOS)
- export TERM='xterm'
- ;;
- (*)
- EDITOR='vim'
- if [ $emacsclient_installed -eq 0 ]; then
- EDITOR="emacsclient --alternate-editor=vim"
- fi
- export EDITOR
- ;;
-esac
-
-export SVN_EDITOR=$EDITOR
-export GIT_EDITOR=$EDITOR
-
-export PATH="/usr/local/bin:/usr/local/sbin:$PATH"
-export MANPATH="/usr/local/man:/usr/local/git/man:$MANPATH"
-export DEV_PATH="$HOME/dev"
-export HOME_DEV_PATH="$HOME/dev/h"
-export WORK_DEV_PATH="$HOME/dev/w"
-export OSS_DEV_PATH="$HOME/dev/oss"
-export CDPATH=":$WORK_DEV_PATH:$HOME_DEV_PATH:$OSS_DEV_PATH:$DEV_PATH:$HOME:$CDPATH"
-
HISTFILE=~/.zsh_history
HISTSIZE=1000
SAVEHIST=1000
REPORTTIME=10 # print elapsed time when more than 10 seconds
+setopt APPEND_HISTORY # adds history
+setopt AUTO_CD
+setopt COMPLETE_IN_WORD
+setopt EXTENDED_HISTORY # add timestamps to history
+setopt HIST_IGNORE_ALL_DUPS # don't record dupes in history
+setopt HIST_REDUCE_BLANKS
+setopt HIST_VERIFY
+setopt IGNORE_EOF
+setopt INC_APPEND_HISTORY SHARE_HISTORY # adds history incrementally and share it across sessions
+setopt LOCAL_OPTIONS # allow functions to have local options
+setopt LOCAL_TRAPS # allow functions to have local traps
setopt NO_BG_NICE # don't nice background tasks
setopt NO_HUP
setopt NO_LIST_BEEP
-setopt LOCAL_OPTIONS # allow functions to have local options
-setopt LOCAL_TRAPS # allow functions to have local traps
-setopt HIST_VERIFY
-setopt SHARE_HISTORY # share history between sessions ???
-setopt EXTENDED_HISTORY # add timestamps to history
setopt PROMPT_SUBST
-setopt CORRECT
-setopt COMPLETE_IN_WORD
-setopt IGNORE_EOF
-
-setopt APPEND_HISTORY # adds history
-setopt INC_APPEND_HISTORY SHARE_HISTORY # adds history incrementally and share it across sessions
-setopt HIST_IGNORE_ALL_DUPS # don't record dupes in history
-setopt HIST_REDUCE_BLANKS
+setopt SHARE_HISTORY # share history between sessions ???
zle -N newtab
+##
+# Bindings
+##
bindkey '^[^[[D' backward-word
bindkey '^[^[[C' forward-word
bindkey '^[[5D' beginning-of-line
View
5 zshrc
@@ -1,8 +1,11 @@
DOTFILES=~/dotfiles
+. $DOTFILES/shared
+
. $DOTFILES/zsh/config
. $DOTFILES/zsh/aliases
. $DOTFILES/zsh/completion
. $DOTFILES/zsh/ruby
-. $DOTFILES/shared
+[[ -f ~/dotfiles-home/zshrc ]] && . ~/dotfiles-home/zshrc
+[[ -f ~/dotfiles-work/zshrc ]] && . ~/dotfiles-work/zshrc

No commit comments for this range

Something went wrong with that request. Please try again.