Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:boushley/dotfiles

  • Loading branch information...
commit d43b9d0c7d97284f2fe62ce2bcd5769b1ab6ae3f 2 parents f17cb83 + 371eb86
@boushley authored
View
4 firefox/vimperatorrc
@@ -3,6 +3,6 @@
inoremap <C-a> <Insert><C-a><Insert>
noremap <C-S-B> :set<Space>gui=invbookmarks<Return>
set hintchars=abcdefghijklmnprstwxyz
-source! /home/boushley/.vimperatorrc.local
+source! /Users/boushley/.vimperatorrc.local
-" vim: set ft=vimperator:
+" vim: set ft=vimperator:
View
2  git/gitconfig
@@ -11,4 +11,4 @@
[core]
autocrlf = input
safecrlf = warn
- excludesfile = /Users/boushley/.gitignore_global
+ excludesfile = ~/.gitignore_global
2  vim/vim/bundle-available/vim-todo-txt
@@ -1 +1 @@
-Subproject commit d3557e18c80164e4b27aa2232580bb1d1c11fb6f
+Subproject commit 9b68b26e8400a30387e746bfc33b97e05b7a788b
View
1  zsh/aliases
@@ -5,7 +5,6 @@ alias psg="ps aux | grep "
alias psr='ps aux | grep ruby'
# Moving around
-alias ..='cd ..'
alias cdb='cd -'
# Show human friendly numbers and colors
View
9 zsh/zshrc
@@ -16,6 +16,9 @@ HISTFILE=~/.histfile
HISTSIZE=2000
SAVEHIST=2000
+# Fixes a problem where git diff with color doesn't show colors
+export LESS=-R
+
# Automatically change to directory if you just type directory name
setopt autocd
@@ -34,10 +37,16 @@ export NODE_PATH=/usr/local/lib/jsctags/:$NODE_PATH
# Use default python environment
source /sdks/python/standard_environment/bin/activate
+# Add hosts from knownhosts to completion
+local knownhosts
+knownhosts=( ${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[0-9]*}%%\ *}%%,*} )
+zstyle ':completion:*:(ssh|scp|sftp):*' hosts $knownhosts
+
# The following lines were added by compinstall
zstyle ':completion:*' completer _complete _ignored _approximate
zstyle ':completion:*' file-sort name
+zstyle ':completion:*' hosts off
zstyle ':completion:*' format 'Completing %d'
zstyle ':completion:*' group-name ''
zstyle ':completion:*' ignore-parents parent pwd
Please sign in to comment.
Something went wrong with that request. Please try again.