Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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: dlh01/dotfiles
base: 7e0b8d18b7
...
head fork: dlh01/dotfiles
compare: 7cbc535181
Checking mergeability… Don't worry, you can still create the pull request.
  • 8 commits
  • 12 files changed
  • 0 commit comments
  • 1 contributor
View
1  .gitignore
@@ -0,0 +1 @@
+compiled.zshrc
View
6 .gitmodules
@@ -58,3 +58,9 @@
[submodule "vim/bundle/tpope-vim-surround"]
path = vim/bundle/tpope-vim-surround
url = https://github.com/tpope/vim-surround
+[submodule "vim/bundle/tpope-vim-haml"]
+ path = vim/bundle/tpope-vim-haml
+ url = https://github.com/tpope/vim-haml.git
+[submodule "vim/bundle/dlh01-snipmate-snippets"]
+ path = vim/bundle/dlh01-snipmate-snippets
+ url = /Users/herreradl/development/snipmate-snippets
View
23 README.md
@@ -3,24 +3,45 @@
# Dependencies
* Git
-* [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
+* [prezto](https://github.com/sorin-ionescu/prezto)
+ * Or: [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
* [osx-trash](http://www.dribin.org/dave/osx-trash/)
* [yadr](https://github.com/skwp/dotfiles)
# Installation
+
+## ZSH
+
+### prezto
+
+1. Run `build.rb` to compile all of our modular files into a single file, which is faster to source.
+
+2. Add the following line to `.zshrc`:
+
+ source /path/to/dotfiles/compiled.zshrc
+
+
+### oh-my-zsh
+
* For each `.zsh` file in `/zsh`: `ln -s ~/dotfiles/zsh/foo.zsh ~/.oh-my-zsh/custom/`
* `secrets.zsh` will source `~/.secrets` if it exists. You can store information inappropriate for the repository there, like your Git user info.
* If necessary, remove the $PATH declaration from `~/zshrc`, as `dotfiles/zsh/path.zsh` handles it
+
+## Git
+
* Install `git` files:
* `ln -s ~/dotfiles/git/gitconfig ~/.gitconfig`
* `ln -s ~/dotfiles/git/gitignore ~/.gitignore_global`
+
+## Vim
+
* To install the YADR plugin managment tools:
1. Copy the `.yadr/bin/yadr` directory to `dotfiles/bin/`
1  vim/bundle/dlh01-snipmate-snippets
@@ -0,0 +1 @@
+Subproject commit 28cb7d95b989083e0b0c63d605d0b9f9cb8bf770
1  vim/bundle/tpope-vim-haml
@@ -0,0 +1 @@
+Subproject commit 9a891ed78a4b222e8c710e533e0d1f21259c0ef1
View
20 vim/plugin/settings/ctrlp.vim
@@ -0,0 +1,20 @@
+" CtrlP configuration borrowed from YADR
+
+let g:ctrlp_custom_ignore = '\.git$\|\.hg$\|\.svn$'
+
+" Default to filename searches - so that appctrl will find application
+" controller
+let g:ctrlp_by_filename = 1
+
+" We don't want to use Ctrl-p as the mapping because
+" it interferes with YankRing (paste, then hit ctrl-p)
+let g:ctrlp_map = ',t'
+nnoremap <silent> ,t :CtrlPMixed<CR>
+
+" Additional mapping for buffer search
+nnoremap <silent> ,b :CloseSingleConque<CR>:CtrlPBuffer<cr>
+nnoremap <silent> <C-b> :CloseSingleConque<CR>:CtrlPBuffer<cr>
+
+" Cmd-Shift-P to clear the cache
+nnoremap <silent> <D-P> :ClearCtrlPCache<cr>
+
View
7 vim/plugin/settings/dlh01-keymaps.vim
@@ -88,8 +88,8 @@ nnoremap <leader>\0 :set colorcolumn=0<cr>
" Type underscores and dashes on the home row
imap <silent> <D-k> _
-imap <silent> <D-d> _
-imap <silent> <D-K> -
+imap <silent> <D-d> -
+imap <silent> <D-K> _
imap <silent> <D-D> -
" ," Surround a word with "quotes"
@@ -162,3 +162,6 @@ nnoremap N Nzz
" Splitjoin
nmap sj :SplitjoinSplit<cr>
nmap sk :SplitjoinJoin<cr>
+
+" Show or hide invisibles
+nmap <leader>i :set list!<cr>
View
9 vimrc
@@ -47,6 +47,13 @@ set clipboard+=unnamed
" Spell-check on
set spell
+" Show invisibles: tabs, trailing spaces, EOL
+set listchars=tab:\ ,eol:¬,trail:-
+
+" Use underscore as a delimiter for word movement
+" http://lglinux.blogspot.com/2008/04/vim-word-movement-with-underscore.html
+set iskeyword-=_
+
" Search settings
" --------------------------------------------------------------------
@@ -90,7 +97,7 @@ set undofile
set autoindent
" Insert indent after a line ending in { or before a line starting with }
-" set smartindent
+set smartindent
" Break lines by word, not character
set linebreak
View
4 zsh/aliases.zsh
@@ -1,4 +1,6 @@
## SHORTCUTS
+# cd by .. or ... or ... or mv file ..../.
+alias '..'='cd ..'
alias -g ...='../..'
alias -g ....='../../..'
alias -g .....='../../../..'
@@ -76,6 +78,8 @@ alias la='ls -aC'
alias lc='cd ~/localhost'
alias ll='ls -alGh'
alias ls='ls -Gh'
+alias m='mvim'
+alias mpcpl='mpc playlist'
alias mv='mv -iv'
alias mvim='mvim --remote-silent'
# mysql with mamp: http://blog-en.mamp.info/2009/08/using-mysql-command-line-with-mamp.html
View
13 zsh/build.rb
@@ -0,0 +1,13 @@
+
+zshfiles = []
+zshfiles = Dir.glob('*.zsh')
+
+compiledfile = 'compiled.zshrc'
+
+# Remove the previous compiled file
+`rm #{compiledfile}`
+
+# Compile each of our .zsh file into a single file to source
+zshfiles.each do |zshfile|
+ `cat #{zshfile} >> #{compiledfile}`
+end
View
3  zsh/options.zsh
@@ -0,0 +1,3 @@
+
+# set ignore case for ls etc
+setopt no_case_glob
View
3  zsh/zstyle.zsh
@@ -1,3 +1,6 @@
# Ignore hosts file when autocompleting
zstyle ':completion:*' hosts off
+
+# case insensitive completion for cd etc
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'

No commit comments for this range

Something went wrong with that request. Please try again.