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: holman/dotfiles
base: master
...
head fork: xenph/dotfiles
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 13 commits
  • 35 files changed
  • 0 commit comments
  • 1 contributor
Showing with 461 additions and 258 deletions.
  1. +0 −3  cas/aliases.zsh
  2. +3 −3 git/gitconfig.symlink
  3. +0 −2  jruby/aliases.zsh
  4. +0 −63 mailplane/stylesheet.css
  5. +0 −12 netnewswire/reclining.nnwstyle/Info.plist
  6. +0 −13 netnewswire/reclining.nnwstyle/Readme.markdown
  7. +0 −69 netnewswire/reclining.nnwstyle/stylesheet.css
  8. +0 −16 netnewswire/reclining.nnwstyle/template.html
  9. +0 −1  rbx/options.zsh
  10. +0 −16 sublime2/User/Base File.sublime-settings
  11. +0 −2  sublime2/User/Default (Linux).sublime-keymap
  12. +0 −2  sublime2/User/Default (OSX).sublime-keymap
  13. +0 −2  sublime2/User/Default (Windows).sublime-keymap
  14. +0 −5 sublime2/User/Global.sublime-settings
  15. +0 −3  sublime2/User/Preferences.sublime-settings
  16. +0 −6 sublime2/copy
  17. +0 −12 sublime2/setup
  18. +1 −1  system/env.zsh
  19. +1 −1  system/keys.zsh
  20. +2 −2 system/path.zsh
  21. +4 −0 tmux/tmux.conf.symlink
  22. +0 −7 todo.txt/README.md
  23. +0 −10 todo.txt/aliases.zsh
  24. +1 −0  vim/vim.symlink/bundle/Command-T
  25. +1 −0  vim/vim.symlink/bundle/ag.vim
  26. +1 −0  vim/vim.symlink/bundle/vim-fugitive
  27. +1 −0  vim/vim.symlink/bundle/vim-powerline
  28. +1 −0  vim/vim.symlink/bundle/vundle
  29. +143 −0 vim/vim.symlink/doc/dwm.txt
  30. +173 −0 vim/vim.symlink/plugin/dwm.vim
  31. +89 −0 vim/vim.symlink/plugin/numbers.vim
  32. +26 −3 vim/vimrc.symlink
  33. +1 −0  zsh/config.zsh
  34. +2 −2 zsh/prompt.zsh
  35. +11 −2 zsh/zshrc.symlink
View
3  cas/aliases.zsh
@@ -1,3 +0,0 @@
-cas_url='http://localhost:8080/cas-server-webapp-3.3.5/login'
-alias casup="$PROJECTS/cas/tomcat/bin/startup.sh & open $cas_url"
-alias casdown="$PROJECTS/cas/tomcat/bin/shutdown.sh"
View
6 git/gitconfig.symlink
@@ -5,8 +5,8 @@
[hub]
protocol = https
[user]
- name = Zach Holman
- email = zach@zachholman.com
+ name = Christopher Beckett
+ email = chris.beckett@bigcommerce.com
[credential]
helper = osxkeychain
[alias]
@@ -30,4 +30,4 @@
[difftool]
prompt = false
[help]
- autocorrect = 1
+ autocorrect = 1
View
2  jruby/aliases.zsh
@@ -1,2 +0,0 @@
-# Quick switch to jruby
-alias j='rvm jruby-1.6.0'
View
63 mailplane/stylesheet.css
@@ -1,63 +0,0 @@
-/*
-Minimal Gmail/Mailplane User Stylesheet
-Copyright (C) 2009 Ryan Tomayko <tomayko.com/about>
-Copyright (C) BEFORE THAT, some other scros on the internet
-*/
-
-* {outline: none !important;}
-* {font-family: 'Lucida Grande', Tahoma, Verdana, Arial, Helvetica, sans-serif !important;}
-.l73JSe { color:#D19800 !important;text-decoration:none !important; }
-.oM { display:none; }
-
-
-/* Hide the links to other apps */
-#gbar { display:none }
-
-/* Put the settings links on the same level as the search box */
-div.nH + div.nH div.nH.qp {
- border: none;
- line-height: 22px;
- height: auto;
- padding-top: 12px;
- position: absolute;
- right: 4px;
- z-index: 100000000 !important;
-}
-
-/* Hide the "Manage this Domain Link" */
-span[id=':qf'] { display:none }
-
-/* Hide the G-mail Logo */
-div.nH + div.nH div.nH div.no div.nH.nn {
- display: none;
-}
-div.nH + div.nH div.nH div.no div.nH.nn + div.nH.nn {
- display: block;
-}
-
-/* Hide the "Search the Web" button */
-div[id=':r8'], div[id=':r9'] {
- display: none !important;
-}
-
-/* Hide the footer */
-div.nH.l2.ov {
- display: none;
-}
-
-/* Hide new window / print box */
-div.hj {
- display: none;
-}
-table.iY > tr > td {
- display: none;
-}
-table.iY > tr > td:first-child {
- display: table-cell;
-}
-
-/* Fixed width font */
-.ii, .ii a {
- font-family: Consolas, 'Dejavu Sans', monospace !important;
- font-size:15px !important;
-}
View
12 netnewswire/reclining.nnwstyle/Info.plist
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CreatorHomePage</key>
- <string>http://github.com/holman/dotfiles</string>
- <key>CreatorName</key>
- <string>Zach Holman</string>
- <key>Version</key>
- <integer>1</integer>
-</dict>
-</plist>
View
13 netnewswire/reclining.nnwstyle/Readme.markdown
@@ -1,13 +0,0 @@
-# RECLINING: I'm getting used to it
-
-### A tidy little theme for NetNewsWire
-
-<a href="http://cl.ly/24QJ"><img src="http://cl.ly/24QJ/content" width="500" /></a>
-
-### Installation
-
-With you double-clicking on `reclining.nnwstyle`, there will be advantages to each.
-
-### Pow Pow
-
-Love, [@holman](http://twitter.com/holman).
View
69 netnewswire/reclining.nnwstyle/stylesheet.css
@@ -1,69 +0,0 @@
-body{
- margin: 0;
- padding: 0;
- -webkit-font-smoothing: antialiased;
-}
-#header{
- background:
- -webkit-gradient(linear, left top, left bottom, from(#F2F5FF), to(#C5E0E3));
-}
-#header{
- color: #335054;
- text-shadow: 1px 1px 0 #fff;
- font-family: Helvetica, sans-serif;
- padding: 10px 0 10px 30px;
-}
-#header #favicon{
- float: right;
-}
-#header #favicon span{
- visibility: hidden;
-}
-#header #favicon img{
- margin-right: 10px;
- visibility: visible;
- float: right;
- display: block;
- border: 1px solid #fff;
-}
-#header .newsItemSource a{
- font-size: 1.25em;
- color: #335054;
- text-decoration: none;
- padding: 5px 10px 5px 0;
-}
-#header .newsItemSource img{
- display: none;
-}
-#header .newsItemDate{
- display: none;
-}
-#header .newsItemCreator{
- color: #999;
- padding-left: 3px;
- font-size: .9em;
-}
-#blendsplit{
- height: 7px;
- background:
- -webkit-gradient(linear, left top, left bottom, from(#ccc), to(#fff));
- border-top: 1px solid #95A8AB;
- margin-bottom: 15px;
-}
-#content #title{
- padding-bottom: 10px;
-}
-#content #title a{
- color: #333;
- font-size: 2.25em;
- text-decoration: none;
-}
-#content #title .newsItemDate{
- display: none;
-}
-#content #title .newsItemCreator{
- display: none;
-}
-#content{
- padding: .5em 30px;
-}
View
16 netnewswire/reclining.nnwstyle/template.html
@@ -1,16 +0,0 @@
-<div id="main">
- <div id="header">
- [[newsitem_dateline]]
- <div id="favicon">[[newsitem_dateline]]</div>
- </div>
-
- <div id="blendsplit"></div>
-
- <div id="content">
- <div id="title">
- [[newsitem_title]]
- </div>
-
- [[newsitem_description]]
- </div>
-</div>
View
1  rbx/options.zsh
@@ -1 +0,0 @@
-export RBXOPT=-Xrbc.db=/tmp/rbx
View
16 sublime2/User/Base File.sublime-settings
@@ -1,16 +0,0 @@
-// Settings in here override those in "Default/Base File.sublime-settings", and
-// are overridden in turn by file type specific settings. Place your settings
-// here, to ensure they're preserved when upgrading.
-{
- "vintage_start_in_command_mode": true,
- "tab_size": 2,
- "translate_tabs_to_spaces": true,
- "drawWhiteSpace": true,
- "matchBracketsAngle": true,
- "matchBracketsBraces": true,
- "matchBracketsSquare": true,
- "rulers": [ 80 ],
- "show_minimap": false,
- "trimTrailingWhiteSpaceOnSave": true,
- "highlight_modified_tabs": true
-}
View
2  sublime2/User/Default (Linux).sublime-keymap
@@ -1,2 +0,0 @@
-[
-]
View
2  sublime2/User/Default (OSX).sublime-keymap
@@ -1,2 +0,0 @@
-[
-]
View
2  sublime2/User/Default (Windows).sublime-keymap
@@ -1,2 +0,0 @@
-[
-]
View
5 sublime2/User/Global.sublime-settings
@@ -1,5 +0,0 @@
-// Place user-specific overrides in this file, to ensure they're preserved
-// when upgrading
-{
- "theme": "Soda Dark.sublime-theme"
-}
View
3  sublime2/User/Preferences.sublime-settings
@@ -1,3 +0,0 @@
-{
- "theme": "Soda Dark.sublime-theme"
-}
View
6 sublime2/copy
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Since Sublime is fucking insane and can't handle symlinks for the User
-# directory, we'll need to manually copy stuff over.
-
-rm -rf $ZSH/sublime2/User
-cp -R ~/Library/Application\ Support/Sublime\ Text\ 2/Packages/User $ZSH/sublime2/User
View
12 sublime2/setup
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Setup a machine for Sublime Text 2
-set -x
-
-# symlink settings in
-sublime_dir=~/Library/Application\ Support/Sublime\ Text\ 2/Packages
-mv "$sublime_dir/User" "$sublime_dir/User.backup"
-ln -s "$ZSH/sublime2/User" "$sublime_dir"
-
-# Grab the Soda theme
-cd "$sublime_dir"
-git clone https://github.com/buymeasoda/soda-theme/ "Theme - Soda"
View
2  system/env.zsh
@@ -1 +1 @@
-export EDITOR='subl'
+export EDITOR='vim'
View
2  system/keys.zsh
@@ -3,4 +3,4 @@
alias hosts="head -2 ~/.ssh/known_hosts | tail -1 > ~/.ssh/known_hosts"
# Pipe my public key to my clipboard. Fuck you, pay me.
-alias pubkey="more ~/.ssh/id_dsa.public | pbcopy | echo '=> Public key copied to pasteboard.'"
+alias pubkey="more ~/.ssh/id_rsa.pub | pbcopy | echo '=> Public key copied to pasteboard.'"
View
4 system/path.zsh
@@ -1,3 +1,3 @@
-export PATH="./bin:$HOME/.rbenv/shims:/usr/local/bin:/usr/local/sbin:$HOME/.sfs:$ZSH/bin:$PATH"
+export PATH="./bin:$HOME/.rbenv/bin:$HOME/.rbenv/shims:/usr/local/bin:/usr/local/sbin:$HOME/.sfs:$ZSH/bin:$PATH"
-export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
+export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
View
4 tmux/tmux.conf.symlink
@@ -0,0 +1,4 @@
+set -g history-limit 100000
+set-window-option -g mode-keys vi
+source-file ~/Library/Python/2.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf
+set -g default-terminal screen-256color
View
7 todo.txt/README.md
@@ -1,7 +0,0 @@
-# todo.txt
-
-This is for [todo.txt](http://todotxt.com). It's a super-simple command-line
-interface to your todo.txt.
-
-I also put the number of todo tasks tagged as `+next` in my ZSH right-hand
-prompt, which helps me focus on what needs to be done next. Pretty cool.
View
10 todo.txt/aliases.zsh
@@ -1,10 +0,0 @@
-# todo.sh: https://github.com/ginatrapani/todo.txt-cli
-function t() {
- if [ $# -eq 0 ]; then
- todo.sh ls
- else
- todo.sh $*
- fi
-}
-
-alias n="t ls +next"
1  vim/vim.symlink/bundle/Command-T
@@ -0,0 +1 @@
+Subproject commit 8df5676d30bac725db6c9f86fb1c997f65eaa2fb
1  vim/vim.symlink/bundle/ag.vim
@@ -0,0 +1 @@
+Subproject commit 622141061417080f09094ae5416d93e5fa1d8a25
1  vim/vim.symlink/bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit 07c078c1be77983cdda49be65abb548e57e9ccd3
1  vim/vim.symlink/bundle/vim-powerline
@@ -0,0 +1 @@
+Subproject commit 20ab08c9a8fe6cdfb7c303aa3063f211d72f8b2f
1  vim/vim.symlink/bundle/vundle
@@ -0,0 +1 @@
+Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e
View
143 vim/vim.symlink/doc/dwm.txt
@@ -0,0 +1,143 @@
+*dwm.txt* Tiled Window Management for Vim
+*dwm*
+
+
+==============================================================================
+CONTENTS *dwm-contents*
+
+ 1.Intro...................................|dwm-intro|
+ 2.Commands................................|dwm-commands|
+ 3.Mappings................................|dwm-mappings|
+ 4.Options.................................|dwm-options|
+ 5.Changelog...............................|dwm-changelog|
+ 6.Credits.................................|dwm-credits|
+ 7.License.................................|dwm-license|
+
+
+==============================================================================
+INTRO *dwm-intro*
+
+dwm.vim adds tiled window management capabilities to Vim. It is highly
+inspired by dwm (Dynamic Window Manager) tiled layout management.
+
+Windows are always organised defined by the following layout consisting of a
+master pane on the left and a stacked pane on the right side:
+
+ +---------------------------------+
+ | | S1 |
+ | |------------------|
+ | M | S2 |
+ | |------------------|
+ | | S3 |
+ +---------------------------------+
+
+|:DWM_New| creates a new window in the master pane that is associated with a
+new empty buffer. The previous master window is pushed on top of the stacked
+pane. |:DWM_Closes| closes any window as long as no unsaved changes are
+pending and updates the layout. An active, stacked window is focused and moved
+to the master pane with |:DWM_Focus|. Any window can occupy the full screen
+with |:DWM_Full| and return from that state with |:DWM_Focus|.
+
+Official releases can be found on vim.org:
+
+ http://www.vim.org/scripts/script.php?script_id=4186
+
+Development happens on GitHub.com:
+
+ https://github.com/spolu/dwm.vim
+
+
+==============================================================================
+COMMANDS *dwm-commands*
+
+:DWM_New *:DWM_New*
+
+Creates a new window with an empty buffer in the master pane.
+
+
+:DWM_Close *:DWM_Close*
+
+Closes the active window if no unsaved changes are pending.
+
+
+:DWM_Focus *:DWM_Focus*
+
+Focus the active window by placing it in the master pane.
+
+
+:DWM_Full *:DWM_Full*
+
+Make the active window full screen. Use |'DWM_Focus'| to return to normal
+mode.
+
+
+==============================================================================
+MAPPINGS *dwm-mappings*
+
+When |'g:dwm_map_keys'| is not defined or set to 1 the following keys are
+mapped:
+
+ <c-n> |:DWM_New|
+ <c-c> |:DWM_Close|
+ <c-space> |:DWM_Focus|
+ <c-m> |:DWM_Full|
+ <c-j> Move cursor clockwise to the next window
+ <c-k> Move cursor counter-clockwise to the previous window
+ <c-,> Rotate windows counter-clockwise
+ <c-.> Rotate windows clockwise
+ <c-h> Grow Master Pane Width
+ <c-l> Shrink Master Pane Width
+
+
+==============================================================================
+OPTIONS *dwm-options*
+
+ *'g:dwm_map_keys'*
+Default: 1
+If enabled, dwm maps control keys to the commands.
+>
+ let g:dwm_map_keys=0
+<
+
+ *'g:dwm_master_pane_width'*
+Default: ?
+Set the width of the master pane. If the value is given as a string, the width
+will be set to a relative percentage of the editor's width.
+>
+ "set master pane width to 85 columns
+ let g:dwm_master_pane_width=85
+
+ "set master pane width to 66% of editor width
+ let g:dwm_master_pane_width="66%"
+<
+
+
+==============================================================================
+CHANGELOG *dwm-changelog*
+
+0.1.1
+ - Huge refactoring to use only window motions
+ - Added Grow/Shrink master pane
+
+==============================================================================
+CREDITS *dwm-credits*
+
+Maintained by
+
+ Stanislas Polu (spolu)
+
+Contributors in alphabetical order
+
+ Dan Sapala (dsapala)
+ Matthias Vogelgesang (matze)
+ mitnk (mitnk)
+ Tony Narlock (tony)
+ rhacker (rhacker)
+ Larry Marburger (lmarburger)
+ Adrien (afriggeri)
+
+
+==============================================================================
+6. License *dwm-license*
+
+
View
173 vim/vim.symlink/plugin/dwm.vim
@@ -0,0 +1,173 @@
+"==============================================================================
+" Copyright: Copyright (C) 2012 Stanislas Polu an other Contributors
+" Permission is hereby granted to use and distribute this code,
+" with or without modifications, provided that this copyright
+" notice is copied with it. Like anything else that's free,
+" dwm.vim is provided *as is* and comes with no warranty of
+" any kind, either expressed or implied. In no event will the
+" copyright holder be liable for any damages resulting from
+" the use of this software.
+" Name Of File: dwm.vim
+" Description: Dynamic Window Manager behaviour for Vim
+" Maintainer: Stanislas Polu (polu.stanislas at gmail dot com)
+" Last Changed: Tuesday, 23 August 2012
+" Version: See g:dwm_version for version number.
+" Usage: This file should reside in the plugin directory and be
+" automatically sourced.
+"
+" For more help see supplied documentation.
+" History: See supplied documentation.
+"==============================================================================
+
+" Exit quickly if already running
+if exists("g:dwm_version") || &cp
+ finish
+endif
+
+let g:dwm_version = "0.1.1"
+
+" Check for Vim version 700 or greater {{{1
+if v:version < 700
+ echo "Sorry, dwm.vim ".g:dwm_version."\nONLY runs with Vim 7.0 and greater."
+ finish
+endif
+
+" All layout transformations assume the layout contains one master pane on the
+" left and an arbitrary number of stacked panes on the right
+" +--------+--------+
+" | | S1 |
+" | +--------+
+" | M | S3 |
+" | +--------+
+" | | S3 |
+" +--------+--------+
+
+" Move the current master pane to the stack
+function! DWM_Stack(clockwise)
+ 1wincmd w
+ if a:clockwise
+ " Move to the top of the stack
+ wincmd K
+ else
+ " Move to the bottom of the stack
+ wincmd J
+ endif
+ " At this point, the layout *should* be the following with the previous master
+ " at the top.
+ " +-----------------+
+ " | M |
+ " +-----------------+
+ " | S1 |
+ " +-----------------+
+ " | S2 |
+ " +-----------------+
+ " | S3 |
+ " +-----------------+
+endfunction
+
+" Add a new buffer
+function! DWM_New()
+ " Move current master pane to the stack
+ call DWM_Stack(1)
+ " Create a vertical split
+ vert topleft new
+ call DWM_ResizeMasterPaneWidth()
+endfunction
+
+" Move the current window to the master pane (the previous master window is
+" added to the top of the stack)
+function! DWM_Focus()
+ let l:curwin = winnr()
+ call DWM_Stack(1)
+ exec l:curwin . "wincmd w"
+ wincmd H
+ call DWM_ResizeMasterPaneWidth()
+endfunction
+
+" Close the current window
+function! DWM_Close()
+ if winnr() == 1
+ " Close master panel.
+ return 'close | wincmd H | call DWM_ResizeMasterPaneWidth()'
+ else
+ return 'close'
+ end
+endfunction
+
+function! DWM_ResizeMasterPaneWidth()
+ " resize the master pane if user defined it
+ if exists('g:dwm_master_pane_width')
+ if type(g:dwm_master_pane_width) == type("")
+ exec 'vertical resize ' . ((str2nr(g:dwm_master_pane_width)*&columns)/100)
+ else
+ exec 'vertical resize ' . g:dwm_master_pane_width
+ endif
+ endif
+endfunction
+
+function! DWM_GrowMaster()
+ if winnr() == 1
+ exec "vertical resize +1"
+ else
+ exec "vertical resize -1"
+ endif
+ if exists("g:dwm_master_pane_width") && g:dwm_master_pane_width
+ let g:dwm_master_pane_width += 1
+ else
+ let g:dwm_master_pane_width = ((&columns)/2)+1
+ endif
+endfunction
+
+function! DWM_ShrinkMaster()
+ if winnr() == 1
+ exec "vertical resize -1"
+ else
+ exec "vertical resize +1"
+ endif
+ if exists("g:dwm_master_pane_width") && g:dwm_master_pane_width
+ let g:dwm_master_pane_width -= 1
+ else
+ let g:dwm_master_pane_width = ((&columns)/2)-1
+ endif
+endfunction
+
+function! DWM_Rotate(clockwise)
+ call DWM_Stack(a:clockwise)
+ if a:clockwise
+ wincmd W
+ else
+ wincmd w
+ endif
+ wincmd H
+ call DWM_ResizeMasterPaneWidth()
+endfunction
+
+nnoremap <silent> <Plug>DWMRotateCounterclockwise :call DWM_Rotate(0)<CR>
+nnoremap <silent> <Plug>DWMRotateClockwise :call DWM_Rotate(1)<CR>
+
+nnoremap <silent> <Plug>DWMNew :call DWM_New()<CR>
+nnoremap <silent> <Plug>DWMClose :exec DWM_Close()<CR>
+nnoremap <silent> <Plug>DWMFocus :call DWM_Focus()<CR>
+
+nnoremap <silent> <Plug>DWMGrowMaster :call DWM_GrowMaster()<CR>
+nnoremap <silent> <Plug>DWMShrinkMaster :call DWM_ShrinkMaster()<CR>
+
+if !exists('g:dwm_map_keys')
+ let g:dwm_map_keys = 1
+endif
+
+if g:dwm_map_keys
+ nnoremap <C-J> <C-W>w
+ nnoremap <C-K> <C-W>W
+
+ nmap <C-,> <Plug>DWMRotateCounterclockwise
+ nmap <C-.> <Plug>DWMRotateClockwise
+
+ nmap <C-N> <Plug>DWMNew
+ nmap <C-C> <Plug>DWMClose
+ nmap <C-@> <Plug>DWMFocus
+ nmap <C-Space> <Plug>DWMFocus
+
+ nmap <C-L> <Plug>DWMGrowMaster
+ nmap <C-H> <Plug>DWMShrinkMaster
+endif
View
89 vim/vim.symlink/plugin/numbers.vim
@@ -0,0 +1,89 @@
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" File: numbers.vim
+" Maintainer: Mahdi Yusuf yusuf.mahdi@gmail.com
+" Version: 0.1.0
+" Description: vim global plugin for better line numbers.
+" Last Change: 26 June, 2012
+" License: MIT License
+" Location: plugin/numbers.vim
+" Website: https://github.com/myusuf3/numbers.vim
+"
+" See numbers.txt for help. This can be accessed by doing:
+"
+" :helptags ~/.vim/doc
+" :help numbers
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let s:numbers_version = '0.1.0'
+
+"Allow use of line continuation
+let s:save_cpo = &cpo
+set cpo&vim
+
+if exists("g:numbers") || v:version < 703 || &cp
+ let &cpo = s:save_cpo
+ echom 'Requires Vim 7.3+'
+ echom 'Failed loading numbers.vim'
+ finish
+ endif
+
+ let g:numbers=1
+ let g:mode=0
+ let g:center=1
+
+ function! SetNumbers()
+ let g:mode = 1
+ call ResetNumbers()
+ endfunc
+
+ function! SetRelative()
+ let g:mode = 0
+ call ResetNumbers()
+ endfunc
+
+ function! NumbersToggle()
+ if (g:mode == 1)
+ let g:mode = 0
+ set relativenumber
+ else
+ let g:mode = 1
+ set number
+ endif
+ endfunc
+
+ function! ResetNumbers()
+ if(g:center == 0)
+ set number
+ elseif(g:mode == 0)
+ set relativenumber
+ else
+ set number
+ end
+ endfunc
+
+ function! Center()
+ let g:center = 1
+ call ResetNumbers()
+ endfunc
+
+ function! Uncenter()
+ let g:center = 0
+ call ResetNumbers()
+ endfunc
+
+ " Triggers mode based on events
+ augroup NumbersAug
+ au!
+ autocmd InsertEnter * :call SetNumbers()
+ autocmd InsertLeave * :call SetRelative()
+ autocmd BufNewFile * :call ResetNumbers()
+ autocmd BufReadPost * :call ResetNumbers()
+ autocmd FocusLost * :call Uncenter()
+autocmd FocusGained * :call Center()
+ augroup END
+
+ " Commands
+ command! -nargs=0 NumbersToggle call NumbersToggle()
+
+ " reset &cpo back to users setting
+ let &cpo = s:save_cpo
View
29 vim/vimrc.symlink
@@ -8,8 +8,8 @@ set autoindent " automatic indent new lines
set smartindent " be smart about it
inoremap # X<BS>#
set nowrap " do not wrap lines
-set softtabstop=2 " yep, two
-set shiftwidth=2 " ..
+set softtabstop=4 " yep, two
+set shiftwidth=4 " ..
set tabstop=4
set expandtab " expand tabs to spaces
set nosmarttab " fuck tabs
@@ -60,7 +60,7 @@ set whichwrap+=<,>,h,l,[,] " backspace and cursor keys wrap to
set shortmess=filtIoOA " shorten messages
set report=0 " tell us about changes
set nostartofline " don't jump to the start of line when scrolling
-
+syntax on
" ----------------------------------------------------------------------------
" Visual Cues
@@ -83,3 +83,26 @@ function! StripWhitespace ()
exec ':%s/ \+$//gc'
endfunction
map ,s :call StripWhitespace ()<CR>
+
+" ---------------------------------------------------------------------------
+" Vundle
+" ---------------------------------------------------------------------------
+
+set nocompatible " be iMproved
+filetype off " required!
+
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+source ~/Library/Python/2.7/lib/python/site-packages/powerline/bindings/vim/plugin/powerline.vim
+
+" let Vundle manage Vundle
+" required!
+ Bundle 'gmarik/vundle'
+
+" My Bundles here:
+"
+" original repos on github
+ Bundle 'tpope/vim-fugitive'
+ Bundle 'Command-T'
+ filetype plugin indent on " required!
+ Bundle 'rking/ag.vim'
View
1  zsh/config.zsh
@@ -46,3 +46,4 @@ bindkey '^[[5C' end-of-line
bindkey '^[[3~' delete-char
bindkey '^[^N' newtab
bindkey '^?' backward-delete-char
+bindkey '^R' history-incremental-search-backward
View
4 zsh/prompt.zsh
@@ -43,7 +43,7 @@ need_push () {
rb_prompt(){
if $(which rbenv &> /dev/null)
then
- echo "%{$fg_bold[yellow]%}$(rbenv version | awk '{print $1}')%{$reset_color%}"
+ echo "%{$fg_bold[yellow]%}$(rbenv version-name)%{$reset_color%}"
else
echo ""
fi
@@ -78,6 +78,6 @@ set_prompt () {
}
precmd() {
- title "zsh" "%m" "%55<...<%~"
+ echo -ne "\e]1;${PWD##*/}\a"
set_prompt
}
View
13 zsh/zshrc.symlink
@@ -2,7 +2,7 @@
export ZSH=$HOME/.dotfiles
# your project folder that we can `c [tab]` to
-export PROJECTS=~/Code
+export PROJECTS=~/Development
# source every .zsh file in this rep
for config_file ($ZSH/**/*.zsh) source $config_file
@@ -19,4 +19,13 @@ autoload -U compinit
compinit
# load every completion after autocomplete loads
-for config_file ($ZSH/**/completion.zsh) source $config_file
+for config_file ($ZSH/**/completion.zsh) source $config_file
+
+PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+PATH=$PATH:$HOME/yagarto/yagarto-4.7.2/bin
+PATH=$PATH:$HOME/yagarto/yagarto-4.7.2/tools
+
+### Added by the Heroku Toolbelt
+export PATH="/Users/chris.beckett/Library/Python/2.7/bin:/usr/local/heroku/bin:$PATH"
+export TERM="screen-256color"
+bindkey -e

No commit comments for this range

Something went wrong with that request. Please try again.