Skip to content

Commit

Permalink
Updating my config to use vundle
Browse files Browse the repository at this point in the history
  • Loading branch information
adamhjk committed Oct 19, 2011
0 parents commit f76b946
Show file tree
Hide file tree
Showing 6 changed files with 570 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitignore
@@ -0,0 +1,3 @@
.net*
*.swp
bundle/*
115 changes: 115 additions & 0 deletions README.md
@@ -0,0 +1,115 @@
Adam's vimrc
-----

To use, want to do this:

'''bash
$ git clone github.com/adamhjk/adam-vim ~/.vim
$ mkdir ~/.vim/bundle
$ ln -s ~/.vim/vimrc ~/.vimrc
$ vim -c 'BundleInstall' -c 'qa!'
$ cd ~/.vim/bundle/command-t
$ rake make
'''

Then marvel at what's up.

## Important configuration stuff

Leader is mapped to ','


## Plugins

The current list is maintained in the vimrc through vundle.

## Commands

### Git
[:GitAdd <file>] git-add <file> or current file if not specified.
[:GitCommit <args>] git-commit.
[:GitStatus] Show git-status of current file or repository.
[:GitLog] Show git-log of current file or repository.
[:GitCheckout <args>] git-checkout. Completes git commits.
[:GitDiff <args>] git-diff. Completes git commits.
[:GitPull <args>] git-pull.
[:GitPullRebase] git-pull --rebase.
[:GitPush <args>] git-push. Defaults to +git push origin <current-branch>+.
[:GitCatFile <args>] git-cat-file.
[:Git <args>] Does any git command.
[:GitVimDiffMerge] Experimental. Call this command on unmerged file to enter vimdiff mode.
[:GitVimDiffMergeDone] Call this command after merging.

### Ack
[:Ack] Takes options, a pattern, and a directory. Shows results in a quickbuffer.
[:AckAdd] Like Ack + grepadd - adds to, rather than replaces, the quickbuffer.
[:LAck] Ack + lgrep - opens in location-list
[:LAckAdd] Appends to the location list

### Tags
[:TlistOpen] Opens the tag list window
[:TlistToggle] Toggle the tag list window

### Surround
Details follow on the exact semantics, but first, consider the following
examples. An asterisk (*) is used to denote the cursor position.

Old text Command New text ~
"Hello *world!" ds" Hello world!
[123+4*56]/2 cs]) (123+456)/2
"Look ma, I'm *HTML!" cs"<q> <q>Look ma, I'm HTML!</q>
if *x>3 { ysW( if ( x>3 ) {
my $str = *whee!; vlllls' my $str = 'whee!';

[ds] = Delete surrounding - use the character or a 't' for tag (ds", dst)
[cs] = Change surrounding - first what to change, then what to change to
[ys] = Takes a motion and surrounds it with the second argument, like cs
[s] = In visual mode, wraps the text with the character argument

### NERD_commenter

[,cc] = Comment the current line, or selected text in visual mode
[,c ] = Toggle the comment
[,ci] = Toggles the set of lines individually (like "c ", but assumes each line may have different settings)
[,cs] = Comment Sexily - up close to the start of each line
[,cA] = Append a comment to the end of the line
[,cl] = Comment and align on the left side
[,cb] = Comment and align on both sides
[,cu] = Uncomment the selected lines

### Gist
[:Gist] = post the whole text to gist
[:'<,'>Gist] = post the selected text to gist
[:Gist -p] = post wholet ext to gist with private
[:Gist -a] = post the whole text to gist with anonymous
[:Gist -e] = Edit the gist
[:Gist -e foo.js] = Edit the gist with the name 'foo.js'
[:Gist XXXXX] = Get gist
[:Gist -c XXXXX] = Get gist and put to clipboard
[:Gist -l] = List my gists
[:Gist -la] = List gists from all

### Textile

[,rp] = :TextilePreview - render textile to a temp file, open in browser
[,rt] = :TextileRenderTab - render textile to a new tab
[,rf] = :TextileREdnerFile - render to a file

### Keymaps
[,d] = Toggle NERDtree
[,t] = Command-T
[,b] = FuzzyBufferFinder
[,l] = TListToggle
[,gd] :GitDiff
[,gD] :GitDiff --cached
[,gs] :GitStatus
[,gl] :GitLog
[,ga] :GitAdd
[,gA] :GitAdd <cfile>
[,gc] :GitCommit

### In git-status buffer
[<Enter>] :GitAdd <cfile>



74 changes: 74 additions & 0 deletions colors/twilight-orig.vim
@@ -0,0 +1,74 @@
" Maintainer: Yoshimasa NIWA<niw@disense.com>
" Last Change: 14 Jun 2006

set background=dark
hi clear
if exists("syntax_on")
syntax reset
endif

let g:colors_name="twilight"

hi Normal guifg=#F8F8F8 guibg=#141414
hi Cursor guifg=#F8F8F8 guibg=#A7A7A7
hi CursorIM guifg=#F8F8F8 guibg=#5F5A60
hi Directory guifg=#8F9D6A guibg=#141414
hi ErrorMsg guifg=#CF6A4C guibg=#420E09
hi VertSplit guifg=#AC885B guibg=#FFFFFF
hi Folded guifg=#F9EE98 guibg=#494949
hi IncSearch guifg=#000000 guibg=#CF6A4C
hi LineNr guifg=#7587A6 guibg=#000000
hi ModeMsg guifg=#CF7D34 guibg=#E9C062
hi MoreMsg guifg=#CF7D34 guibg=#E9C062
hi NonText guifg=#D2A8A1 guibg=#141414
hi Question guifg=#7587A6 guibg=#0E2231
hi Search guifg=#420E09 guibg=#CF6A4C
hi SpecialKey guifg=#CF7D34 guibg=#141414
hi StatusLine guifg=#0E2231 guibg=#8693A5
hi StatusLineNC guifg=#7587A6 guibg=#F8F8F8
hi Title guifg=#8B98AB guibg=#0E2231
hi Visual guifg=#0E2231 guibg=#AFC4DB
hi WarningMsg guifg=#CF6A4C guibg=#420E09
hi WildMenu guifg=#AFC4DB guibg=#0E2231

"Syntax hilight groups

hi Comment guifg=#8F9D6A
hi Constant guifg=#CF6A4C
hi String guifg=#8F9D6A
hi Character guifg=#E9C062
hi Number guifg=#9B859D
hi Boolean guifg=#CF6A4C
hi Float guifg=#562D56
hi Identifier guifg=#9B703F
hi Function guifg=#9B5C2E
hi Statement guifg=#CF7D34
hi Conditional guifg=#9B703F
hi Repeat guifg=khaki
hi Label guifg=#E9C062
hi Operator guifg=#CF6A4C
hi Keyword guifg=#E9C062
hi Exception guifg=khaki
hi PreProc guifg=khaki4
hi Include guifg=khaki4
hi Define guifg=khaki1
hi Macro guifg=#9B703F
hi PreCondit guifg=khaki3
hi Type guifg=khaki3
hi StorageClass guifg=tan
hi Structure guifg=DarkGoldenrod
hi Typedef guifg=khaki3
hi Special guifg=IndianRed
hi SpecialChar guifg=DarkGoldenrod
hi Tag guifg=DarkKhaki
hi Delimiter guifg=DarkGoldenrod
hi SpecialComment guifg=cornsilk
hi Debug guifg=brown
hi Underlined guifg=#Cf6A4C
hi Ignore guifg=#494949
hi Error guifg=#CF6A4C guibg=#420E09
hi Todo guifg=#7587A6 guibg=#0E2231
hi Pmenu guifg=#141414 guibg=#CDA869
hi PmenuSel guifg=#F8F8F8 guibg=#9B703F
hi PmenuSbar guibg=#DAEFA3
hi PmenuThumb guifg=#8F9D6A
74 changes: 74 additions & 0 deletions colors/twilight.vim
@@ -0,0 +1,74 @@
" Maintainer: Yoshimasa NIWA<niw@disense.com>
" Last Change: 14 Jun 2006

set background=dark
hi clear
if exists("syntax_on")
syntax reset
endif

let g:colors_name="twilight"

hi Normal guifg=#F8F8F8 guibg=#000000
hi Cursor guifg=#F8F8F8 guibg=#A7A7A7
hi CursorIM guifg=#F8F8F8 guibg=#5F5A60
hi Directory guifg=#8F9D6A guibg=#000000
hi ErrorMsg guifg=#CF6A4C guibg=#420E09
hi VertSplit guifg=#AC885B guibg=#FFFFFF
hi Folded guifg=#F9EE98 guibg=#494949
hi IncSearch guifg=#000000 guibg=#CF6A4C
hi LineNr guifg=#7587A6 guibg=#000000
hi ModeMsg guifg=#CF7D34 guibg=#E9C062
hi MoreMsg guifg=#CF7D34 guibg=#E9C062
hi NonText guifg=#D2A8A1 guibg=#000000
hi Question guifg=#7587A6 guibg=#0E2231
hi Search guifg=#420E09 guibg=#CF6A4C
hi SpecialKey guifg=#CF7D34 guibg=#000000
hi StatusLine guifg=#0E2231 guibg=#8693A5
hi StatusLineNC guifg=#7587A6 guibg=#F8F8F8
hi Title guifg=#8B98AB guibg=#0E2231
hi Visual guifg=#0E2231 guibg=#AFC4DB
hi WarningMsg guifg=#CF6A4C guibg=#420E09
hi WildMenu guifg=#AFC4DB guibg=#0E2231

"Syntax hilight groups

hi Comment guifg=#8F9D6A
hi Constant guifg=#CF6A4C
hi String guifg=#8F9D6A
hi Character guifg=#E9C062
hi Number guifg=#9B859D
hi Boolean guifg=#CF6A4C
hi Float guifg=#562D56
hi Identifier guifg=#9B703F
hi Function guifg=#9B5C2E
hi Statement guifg=#CF7D34
hi Conditional guifg=#9B703F
hi Repeat guifg=khaki
hi Label guifg=#E9C062
hi Operator guifg=#CF6A4C
hi Keyword guifg=#E9C062
hi Exception guifg=khaki
hi PreProc guifg=khaki4
hi Include guifg=khaki4
hi Define guifg=khaki1
hi Macro guifg=#9B703F
hi PreCondit guifg=khaki3
hi Type guifg=khaki3
hi StorageClass guifg=tan
hi Structure guifg=DarkGoldenrod
hi Typedef guifg=khaki3
hi Special guifg=IndianRed
hi SpecialChar guifg=DarkGoldenrod
hi Tag guifg=DarkKhaki
hi Delimiter guifg=DarkGoldenrod
hi SpecialComment guifg=cornsilk
hi Debug guifg=brown
hi Underlined guifg=#Cf6A4C
hi Ignore guifg=#494949
hi Error guifg=#CF6A4C guibg=#420E09
hi Todo guifg=#7587A6 guibg=#0E2231
hi Pmenu guifg=#000000 guibg=#CDA869
hi PmenuSel guifg=#F8F8F8 guibg=#9B703F
hi PmenuSbar guibg=#DAEFA3
hi PmenuThumb guifg=#8F9D6A
74 changes: 74 additions & 0 deletions colors/twilight2.vim
@@ -0,0 +1,74 @@
" Maintainer: Yoshimasa NIWA<niw@disense.com>
" Last Change: 14 Jun 2006

set background=dark
hi clear
if exists("syntax_on")
syntax reset
endif

let g:colors_name="twilight"

hi Normal guifg=#F8F8F8 guibg=#141414
hi Cursor guifg=#F8F8F8 guibg=#A7A7A7
hi CursorIM guifg=#F8F8F8 guibg=#5F5A60
hi Directory guifg=#8F9D6A guibg=#141414
hi ErrorMsg guifg=#CF6A4C guibg=#420E09
hi VertSplit guifg=#AC885B guibg=#FFFFFF
hi Folded guifg=#F9EE98 guibg=#494949
hi IncSearch guifg=#000000 guibg=#CF6A4C
hi LineNr guifg=#7587A6 guibg=#000000
hi ModeMsg guifg=#CF7D34 guibg=#E9C062
hi MoreMsg guifg=#CF7D34 guibg=#E9C062
hi NonText guifg=#D2A8A1 guibg=#141414
hi Question guifg=#7587A6 guibg=#0E2231
hi Search guifg=#420E09 guibg=#CF6A4C
hi SpecialKey guifg=#CF7D34 guibg=#141414
hi StatusLine guifg=#0E2231 guibg=#8693A5
hi StatusLineNC guifg=#7587A6 guibg=#F8F8F8
hi Title guifg=#8B98AB guibg=#0E2231
hi Visual guifg=#0E2231 guibg=#AFC4DB
hi WarningMsg guifg=#CF6A4C guibg=#420E09
hi WildMenu guifg=#AFC4DB guibg=#0E2231

"Syntax hilight groups

hi Comment guifg=#8F9D6A
hi Constant guifg=#CF6A4C
hi String guifg=#ddf2a4
hi Character guifg=#E9C062
hi Number guifg=#9B859D
hi Boolean guifg=#CF6A4C
hi Float guifg=#562D56
hi Identifier guifg=#7587a6
hi Function guifg=#8B98AB
hi Statement guifg=#CF7D34
hi Conditional guifg=#D2A8A1
hi Repeat guifg=khaki
hi Label guifg=#E9C062
hi Operator guifg=#CF6A4C
hi Keyword guifg=#0E2231
hi Exception guifg=khaki
hi PreProc guifg=khaki4
hi Include guifg=khaki4
hi Define guifg=khaki1
hi Macro guifg=#9B703F
hi PreCondit guifg=khaki3
hi Type guifg=khaki3
hi StorageClass guifg=tan
hi Structure guifg=DarkGoldenrod
hi Typedef guifg=khaki3
hi Special guifg=IndianRed
hi SpecialChar guifg=DarkGoldenrod
hi Tag guifg=DarkKhaki
hi Delimiter guifg=DarkGoldenrod
hi SpecialComment guifg=cornsilk
hi Debug guifg=brown
hi Underlined guifg=#Cf6A4C
hi Ignore guifg=#494949
hi Error guifg=#CF6A4C guibg=#420E09
hi Todo guifg=#7587A6 guibg=#0E2231
hi Pmenu guifg=#141414 guibg=#CDA869
hi PmenuSel guifg=#F8F8F8 guibg=#9B703F
hi PmenuSbar guibg=#DAEFA3
hi PmenuThumb guifg=#8F9D6A

0 comments on commit f76b946

Please sign in to comment.