Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: benmcredmond/dotfiles
base: 60f3fef66f
...
head fork: benmcredmond/dotfiles
compare: a0367ed17c
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Showing with 21 additions and 59 deletions.
  1. +9 −0 gitconfig
  2. +0 −8 screenrc
  3. +4 −0 vimrc
  4. +8 −51 zshrc
View
9 gitconfig
@@ -0,0 +1,9 @@
+[user]
+ name = Ben McRedmond
+ email = ben@benmcredmond.com
+[diff]
+ tool = vimdiff
+[difftool]
+ prompt = false
+[alias]
+ d = difftool
View
8 screenrc
@@ -1,8 +0,0 @@
-startup_message off
-hardstatus alwayslastline "%{= kR} %-Lw%{=b Kk} %n%f %t %{-}%+Lw %=%{= dd}"
-
-# for ctrl right and left arrows
-bindkey ^[[1;5D prev
-bindkey ^[[1;5C next
-
-setenv SCREEN_RUNNING "yes"
View
4 vimrc
@@ -96,3 +96,7 @@ nmap <leader>d <C-]>
nmap <leader>c <C-t>
" open definition in a new vertical split
nmap <leader>s :vsp <CR><C-w>l:exec("tag ".expand("<cword>"))<CR>
+
+if has("gui_running")
+ set guioptions=egmrt
+endif
View
59 zshrc
@@ -27,7 +27,7 @@ export PATH=$HOME/.rbenv/bin:/usr/local/bin:$PATH
if [[ "$(uname)" == "Darwin" ]]; then
export PATH=/Applications/MacVim.app/Contents/MacOS:$PATH
- alias Vim="vim"
+ alias vim="Vim"
fi
export EDITOR="vim -f"
@@ -45,55 +45,12 @@ zle -N history-beginning-search-forward-end \
bindkey '^[[A' history-beginning-search-backward-end
bindkey '^[[B' history-beginning-search-forward-end
-# Stuff for screen tabs
-if [[ $SCREEN_RUNNING == "yes" ]]; then
- _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^~$USER/~/"'
-
- # use the current user as the prefix of the current tab title (since that's
- # fairly important, and I change it fairly often)
- TAB_TITLE_PREFIX='"`'$_GET_PATH' | sed "s:..*/::"`:$PROMPT_CHAR"'
- # when at the shell prompt, show a truncated version of the current path (with
- # standard ~ replacement) as the rest of the title.
- TAB_TITLE_PROMPT='$SHELL:t'
- # when running a command, show the title of the command as the rest of the
- # title (truncate to drop the path to the command)
- TAB_TITLE_EXEC='$cmd[1]:t'
-
- # use the current path (with standard ~ replacement) in square brackets as the
- # prefix of the tab window hardstatus.
- TAB_HARDSTATUS_PREFIX='"[`'$_GET_PATH'`] "'
- # when at the shell prompt, use the shell name (truncated to remove the path to
- # the shell) as the rest of the title
- TAB_HARDSTATUS_PROMPT='$SHELL:t'
- # when running a command, show the command name and arguments as the rest of
- # the title
- TAB_HARDSTATUS_EXEC='$cmd'
-
- # tell GNU screen what the tab window title ($1) and the hardstatus($2) should be
- function screen_set()
- {
- # set the tab window title (%t) for screen
- print -nR $'\033k'$1$'\033'\\\
-
- # set hardstatus of tab window (%h) for screen
- print -nR $'\033]0;'$2$'\a'
- }
- # called by zsh before executing a command
- function preexec()
- {
- local -a cmd; cmd=(${(z)1}) # the command string
- eval "tab_title=$TAB_TITLE_PREFIX:$TAB_TITLE_EXEC"
- eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_EXEC"
- screen_set $tab_title $tab_hardstatus
- }
- # called by zsh before showing the prompt
- function precmd()
- {
- eval "tab_title=$TAB_TITLE_PREFIX$TAB_TITLE_PROMPT"
- eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX$TAB_HARDSTATUS_PROMPT"
- screen_set $tab_title $tab_hardstatus
- }
+which rbenv &> /dev/null
+if [[ $? -eq 0 ]]; then
+ eval "$(rbenv init -)"
fi
-#[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-eval "$(rbenv init -)"
+which hub &> /dev/null
+if [[ $? -eq 0 ]]; then
+ eval "$(hub alias -s zsh)"
+fi

No commit comments for this range

Something went wrong with that request. Please try again.