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: codebeige/dotfiles
base: 26447edd92
...
head fork: codebeige/dotfiles
compare: 13817c9e74
  • 5 commits
  • 12 files changed
  • 0 commit comments
  • 1 contributor
View
6 .gitmodules
@@ -13,9 +13,6 @@
[submodule "vim/bundle/nerdtree"]
path = vim/bundle/nerdtree
url = git://github.com/scrooloose/nerdtree.git
-[submodule "vim/bundle/command-t"]
- path = vim/bundle/command-t
- url = git://github.com/wincent/Command-T.git
[submodule "vim/bundle/dirdiff"]
path = vim/bundle/dirdiff
url = git://github.com/vim-scripts/DirDiff.vim.git
@@ -67,3 +64,6 @@
[submodule "vim/project"]
path = vim/project
url = https://github.com/shemerey/vim-project.git
+[submodule "oh-my-zsh"]
+ path = oh-my-zsh
+ url = https://github.com/robbyrussell/oh-my-zsh.git
View
4 gvimrc
@@ -4,7 +4,5 @@ set background=light
set guifont=Menlo:h13
set antialias
-set guioptions-=T
+set guioptions=egm
set lines=60 columns=140
-
-runtime macros/shellmenu.vim
1  oh-my-zsh
@@ -0,0 +1 @@
+Subproject commit 3e9493fb301b7d34bb6861787d97067ec9365268
1  vim/bundle/command-t
@@ -1 +0,0 @@
-Subproject commit e9a861b34674608ffa70e26063674245cd4e0927
2  vim/bundle/ctrlp
@@ -1 +1 @@
-Subproject commit f7322b3d125cb68d0abbf965058efcade34b6d67
+Subproject commit 64dca5ec7961cbd4a5a7da460890e70ae8716db4
2  vim/bundle/endwise
@@ -1 +1 @@
-Subproject commit 9a9d1994eaeae3f2f23da6bb71111782ab70276c
+Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
2  vim/bundle/fugitive
@@ -1 +1 @@
-Subproject commit c72a689f7f4deb7e7ad9947143383ada000476ae
+Subproject commit b4b75ef682da3e946c648d3634ade39d0af49aba
2  vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc
+Subproject commit 49b88757b019143ec6604b35c399de8f9bd2d954
2  vim/bundle/rooter
@@ -1 +1 @@
-Subproject commit 26b39e549b26584bd739c9b12c9e8069b63378c8
+Subproject commit 529d4c6054ef10710cd5c049edae64150ef89562
View
24 vimrc
@@ -145,7 +145,9 @@ au BufNewFile,BufReadPost *.coffee setl foldmethod=indent nofoldenable
au BufNewFile,BufReadPost *.coffee setl shiftwidth=2 expandtab
" delimitMate
-let g:delimitMate_excluded_regions=""
+let g:delimitMate_excluded_regions = ""
+let g:delimitMate_expand_space = 1
+let g:delimitMate_expand_cr = 1
" SQL
let g:sql_type_default = 'pgsql'
@@ -153,7 +155,7 @@ let g:dbext_default_type = 'PGSQL'
let g:ftplugin_sql_omni_key = '<C-x>'
let g:omni_sql_include_owner = 0
-""" Scripts
+""" Scripts & commands
" bdd
map <leader>ca :wa<bar>!bundle exec cucumber features<cr>
@@ -163,3 +165,21 @@ map <leader>c% :wa<bar>!bundle exec cucumber %<cr>
map <leader>ra :wa<bar>!bundle exec rspec spec<cr>
map <leader>r% :wa<bar>let g:RspecRecentTestFile=expand('%:p')<bar>!bundle exec rspec --format=documentation %<cr>
map <leader>rr :wa<bar>execute("!bundle exec rspec --format=documentation " . g:RspecRecentTestFile)<cr>
+
+" project vimrc
+if !exists('loaded_vimrc')
+ function! s:SourceVimrc()
+ let s:local_vimrc = getcwd() . '/.vimrc'
+ if s:local_vimrc != $MYVIMRC && filereadable(s:local_vimrc)
+ exec 'source' . s:local_vimrc
+ endif
+ endfunction
+
+ command! Vimrc :call <SID>SourceVimrc()
+ augroup vimrc
+ autocmd!
+ autocmd BufEnter * :Vimrc
+ augroup END
+
+ let loaded_vimrc = 1
+endif
View
5 zshenv
@@ -0,0 +1,5 @@
+export PATH=/usr/local/bin:/usr/local/sbin:$PATH
+export NODE_PATH=/usr/local/lib/node_modules
+export HBASE_HOME=/usr/local/Cellar/hbase/0.90.4/libexec
+
+eval "$(rbenv init -)"
View
33 zshrc
@@ -1 +1,32 @@
-# Created by newuser for 4.3.12
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Set name of the theme to load.
+# Look in ~/.oh-my-zsh/themes/
+# Optionally, if you set this to "random", it'll load a random theme each
+# time that oh-my-zsh is loaded.
+ZSH_THEME="blinks"
+
+# Set to this to use case-sensitive completion
+# CASE_SENSITIVE="true"
+
+# Comment this out to disable weekly auto-update checks
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# DISABLE_LS_COLORS="true"
+
+# Uncomment following line if you want to disable autosetting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+# COMPLETION_WAITING_DOTS="true"
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Example format: plugins=(rails git textmate ruby lighthouse)
+plugins=(git osx ruby bundler brew pow powder rails3 vi-mode)
+
+source $ZSH/oh-my-zsh.sh
+
+export EDITOR='/usr/local/bin/vim'
+export PSQL_EDITOR='vim -c"set syntax=pgsql"'

No commit comments for this range

Something went wrong with that request. Please try again.