Permalink
Browse files

merge with master

  • Loading branch information...
2 parents 6e8d551 + 86c8c8a commit ce2276029b97974a952e79cfd3ab8fe1f065ffd1 @mitechie committed Sep 9, 2010
Showing with 7,280 additions and 48 deletions.
  1. +1 −0 {vim → .vim}/.VimballRecord
  2. +5 −0 .vim/.netrwhist
  3. BIN .vim/after/plugin/.snipMate.vim.swp
  4. 0 {vim → .vim}/after/plugin/snipMate.vim
  5. +1,660 −0 .vim/autoload/DrawIt.vim
  6. 0 {vim → .vim}/autoload/snipMate.vim
  7. 0 {vim → .vim}/autoload/tcomment.vim
  8. 0 {vim → .vim}/colors/darkburn.vim
  9. 0 {vim → .vim}/colors/darkdevel.vim
  10. 0 {vim → .vim}/colors/darkspectrum.vim
  11. 0 {vim → .vim}/colors/hornet.vim
  12. 0 {vim → .vim}/colors/kaltex.vim
  13. +38 −31 {vim → .vim}/colors/lucius.vim
  14. 0 {vim → .vim}/colors/tango2.vim
  15. +98 −0 .vim/colors/underwater-mod.vim
  16. +68 −0 .vim/colors/vilight.vim
  17. +11 −0 .vim/dict.add
  18. +399 −0 .vim/doc/DrawIt.txt
  19. 0 {vim → .vim}/doc/NERD_tree.txt
  20. 0 {vim → .vim}/doc/snipMate.txt
  21. 0 {vim → .vim}/doc/supertab.txt
  22. +222 −0 .vim/doc/surround.txt
  23. 0 {vim → .vim}/doc/tComment.txt
  24. +47 −0 {vim → .vim}/doc/tags
  25. 0 {vim → .vim}/doc/xml-plugin.txt
  26. 0 {vim → .vim}/ftplugin/html.vim
  27. 0 {vim → .vim}/ftplugin/html_snip_helper.vim
  28. 0 {vim → .vim}/ftplugin/javascript.vim
  29. +953 −0 .vim/ftplugin/mako.vim
  30. 0 {vim → .vim}/ftplugin/python.vim
  31. BIN .vim/ftplugin/python/pyflakes-vim.zip
  32. +300 −0 .vim/ftplugin/python/pyflakes.vim
  33. +21 −0 .vim/ftplugin/python/pyflakes/LICENSE
  34. +36 −0 .vim/ftplugin/python/pyflakes/README.rst
  35. +11 −0 .vim/ftplugin/python/pyflakes/TODO
  36. 0 .vim/ftplugin/python/pyflakes/pyflakes/__init__.py
  37. +311 −0 .vim/ftplugin/python/pyflakes/pyflakes/ast.py
  38. +408 −0 .vim/ftplugin/python/pyflakes/pyflakes/checker.py
  39. +77 −0 .vim/ftplugin/python/pyflakes/pyflakes/messages.py
  40. 0 .vim/ftplugin/python/pyflakes/pyflakes/scripts/__init__.py
  41. +63 −0 .vim/ftplugin/python/pyflakes/pyflakes/scripts/pyflakes.py
  42. 0 .vim/ftplugin/python/pyflakes/pyflakes/test/__init__.py
  43. +24 −0 .vim/ftplugin/python/pyflakes/pyflakes/test/harness.py
  44. +512 −0 .vim/ftplugin/python/pyflakes/pyflakes/test/test_imports.py
  45. +234 −0 .vim/ftplugin/python/pyflakes/pyflakes/test/test_other.py
  46. +48 −0 .vim/ftplugin/python/pyflakes/pyflakes/test/test_script.py
  47. +182 −0 .vim/ftplugin/python/pyflakes/pyflakes/test/test_undefined_names.py
  48. +19 −0 .vim/ftplugin/python/pyflakes/setup.py
  49. +124 −0 .vim/ftplugin/python/quickfix.diff
  50. +1 −1 {vim → .vim}/ftplugin/xml.vim
  51. 0 {vim → .vim}/nerdtree_plugin/exec_menuitem.vim
  52. 0 {vim → .vim}/nerdtree_plugin/fs_menu.vim
  53. +65 −0 .vim/plugin/DrawItPlugin.vim
  54. 0 {vim → .vim}/plugin/NERD_tree.vim
  55. +482 −0 .vim/plugin/cecutil.vim
  56. 0 {vim → .vim}/plugin/lusty-juggler.vim
  57. 0 {vim → .vim}/plugin/pydoc.vim
  58. 0 {vim → .vim}/plugin/snipMate.vim
  59. 0 {vim → .vim}/plugin/supertab.vim
  60. +625 −0 .vim/plugin/surround.vim
  61. 0 {vim → .vim}/plugin/tComment.vim
  62. 0 {vim → .vim}/snippets/_.snippets
  63. 0 {vim → .vim}/snippets/autoit.snippets
  64. 0 {vim → .vim}/snippets/c.snippets
  65. 0 {vim → .vim}/snippets/cpp.snippets
  66. 0 {vim → .vim}/snippets/html.snippets
  67. 0 {vim → .vim}/snippets/java.snippets
  68. 0 {vim → .vim}/snippets/javascript.snippets
  69. 0 {vim → .vim}/snippets/mako.snippets
  70. 0 {vim → .vim}/snippets/objc.snippets
  71. 0 {vim → .vim}/snippets/perl.snippets
  72. 0 {vim → .vim}/snippets/php.snippets
  73. +1 −1 {vim → .vim}/snippets/python.snippets
  74. 0 {vim → .vim}/snippets/ruby.snippets
  75. 0 {vim → .vim}/snippets/sh.snippets
  76. 0 {vim → .vim}/snippets/snippet.snippets
  77. 0 {vim → .vim}/snippets/tcl.snippets
  78. 0 {vim → .vim}/snippets/tex.snippets
  79. 0 {vim → .vim}/snippets/vim.snippets
  80. 0 {vim → .vim}/snippets/zsh.snippets
  81. 0 {vim → .vim}/syntax/jinja.vim
  82. 0 {vim → .vim}/syntax/jquery.vim
  83. 0 {vim → .vim}/syntax/json.vim
  84. +86 −0 .vim/syntax/mako.vim
  85. 0 {vim → .vim}/syntax/snippet.vim
  86. +102 −12 vimrc → .vimrc
  87. +38 −0 install.py
  88. +8 −3 vimsync.sh
@@ -1,3 +1,4 @@
tComment.vba: call delete('/home/rharding/.vim/doc/tComment.txt')|call delete('/home/rharding/.vim/plugin/tComment.vim')|call delete('/home/rharding/.vim/autoload/tcomment.vim')
supertab.vba: call delete('/home/rharding/.vim/doc/supertab.txt')|call delete('/home/rharding/.vim/plugin/supertab.vim')
twitvim-0.4.5.vba: call delete('/home/rharding/.vim/plugin/twitvim.vim')|call delete('/home/rharding/.vim/doc/twitvim.txt')
+DrawIt.vba: call delete('/home/rharding/.vim/plugin/DrawItPlugin.vim')|call delete('/home/rharding/.vim/plugin/cecutil.vim')|call delete('/home/rharding/.vim/autoload/DrawIt.vim')|call delete('/home/rharding/.vim/doc/DrawIt.txt')
View
@@ -0,0 +1,5 @@
+let g:netrw_dirhistmax =10
+let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_1='/home/rharding/src/quipp/quipp/test'
+let g:netrw_dirhist_2='/home/rharding/configs/pyvim'
+let g:netrw_dirhist_3='/home/rharding/configs/bin'
Binary file not shown.
File renamed without changes.
View

Large diffs are not rendered by default.

Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,7 @@
" Vim color file
" Maintainer: Jonathan Filip <jfilip1024@gmail.com>
-" Last Modified: Wed Oct 21, 2009 11:39AM
-" Version: 3.1
+" Last Modified: Mon Apr 19, 2010 10:24AM
+" Version: 3.5
"
" GUI / 256 color terminal
"
@@ -65,11 +65,11 @@ hi Float ctermfg=116 cterm=none
" Identifier Group
" ----------------
" any variable name
-hi Identifier guifg=#efaf7f gui=none
-hi Identifier ctermfg=216 cterm=none
+hi Identifier guifg=#e6c080 gui=none
+hi Identifier ctermfg=180 cterm=none
" function, method, class
-hi Function guifg=#efaf7f gui=none
-hi Function ctermfg=216 cterm=none
+hi Function guifg=#e6c080 gui=none
+hi Function ctermfg=180 cterm=none
" Statement Group
@@ -100,20 +100,20 @@ hi Keyword ctermfg=150 cterm=none
" Preprocessor Group
" ------------------
" generic preprocessor
-hi PreProc guifg=#f0dfaf gui=none
-hi PreProc ctermfg=223 cterm=none
+hi PreProc guifg=#e9dfaf gui=none
+hi PreProc ctermfg=187 cterm=none
" #include
-hi Include guifg=#f0dfaf gui=none
-hi Include ctermfg=223 cterm=none
+hi Include guifg=#e9dfaf gui=none
+hi Include ctermfg=187 cterm=none
" #define
-hi Define guifg=#f0dfaf gui=none
-hi Define ctermfg=223 cterm=none
+hi Define guifg=#e9dfaf gui=none
+hi Define ctermfg=187 cterm=none
" same as define
-hi Macro guifg=#f0dfaf gui=none
-hi Macro ctermfg=223 cterm=none
+hi Macro guifg=#e9dfaf gui=none
+hi Macro ctermfg=187 cterm=none
" #if, #else, #endif
-hi PreCondit guifg=#f0dfaf gui=none
-hi PreCondit ctermfg=223 cterm=none
+hi PreCondit guifg=#e9dfaf gui=none
+hi PreCondit ctermfg=187 cterm=none
" Type Group
@@ -186,16 +186,16 @@ hi Todo ctermfg=228 ctermbg=NONE cterm=underl
" --------
" word not recognized
hi SpellBad guisp=#ee0000 gui=undercurl
-hi SpellBad ctermbg=9 cterm=undercurl
+hi SpellBad ctermbg=196 cterm=undercurl
" word not capitalized
hi SpellCap guisp=#eeee00 gui=undercurl
-hi SpellCap ctermbg=12 cterm=undercurl
+hi SpellCap ctermbg=226 cterm=undercurl
" rare word
hi SpellRare guisp=#ffa500 gui=undercurl
-hi SpellRare ctermbg=13 cterm=undercurl
+hi SpellRare ctermbg=214 cterm=undercurl
" wrong spelling for selected region
hi SpellLocal guisp=#ffa500 gui=undercurl
-hi SpellLocal ctermbg=14 cterm=undercurl
+hi SpellLocal ctermbg=214 cterm=undercurl
" Cursor
@@ -207,10 +207,10 @@ hi Cursor ctermfg=bg ctermbg=153
hi CursorIM guifg=bg guibg=#96cdcd
hi CursorIM ctermfg=bg ctermbg=116
" cursor column
-hi CursorColumn guifg=NONE guibg=#202438 gui=none
+hi CursorColumn guifg=NONE guibg=#404448 gui=none
hi CursorColumn ctermfg=NONE ctermbg=236 cterm=none
" cursor line/row
-hi CursorLine gui=NONE guibg=#202438 gui=none
+hi CursorLine gui=NONE guibg=#404448 gui=none
hi CursorLine cterm=NONE ctermbg=236 cterm=none
@@ -230,7 +230,7 @@ hi SignColumn guifg=#9fafaf guibg=#181818 gui=none
hi SignColumn ctermfg=145 ctermbg=233 cterm=none
" line numbers
hi LineNr guifg=#818698 guibg=#363946
-hi LineNr ctermfg=102 ctermbg=237
+hi LineNr ctermfg=245 ctermbg=237
" match parenthesis, brackets
hi MatchParen guifg=#00ff00 guibg=NONE gui=bold
hi MatchParen ctermfg=46 ctermbg=NONE cterm=bold
@@ -242,13 +242,13 @@ hi ModeMsg guifg=#76d5f8 guibg=NONE gui=none
hi ModeMsg ctermfg=117 ctermbg=NONE cterm=none
" the '~' and '@' and showbreak, '>' double wide char doesn't fit on line
hi NonText guifg=#404040 gui=none
-hi NonText ctermfg=235 cterm=none
+hi NonText ctermfg=238 cterm=none
" the hit-enter prompt (show more output) and yes/no questions
hi Question guifg=fg gui=none
hi Question ctermfg=fg cterm=none
" meta and special keys used with map, unprintable characters
-hi SpecialKey guifg=#404040
-hi SpecialKey ctermfg=237
+hi SpecialKey guifg=#405060
+hi SpecialKey ctermfg=239
" titles for output from :set all, :autocmd, etc
hi Title guifg=#62bdde gui=none
hi Title ctermfg=74 cterm=none
@@ -259,31 +259,37 @@ hi WarningMsg ctermfg=173 cterm=none
" current match in the wildmenu completion
hi WildMenu guifg=#cae682 guibg=#363946 gui=bold,underline
hi WildMenu ctermfg=16 ctermbg=186 cterm=bold
+" color column highlighting
+hi ColorColumn guifg=NONE guibg=#403630 gui=none
+hi ColorColumn ctermfg=NONE ctermbg=94 cterm=none
" Diff
" ----
" added line
hi DiffAdd guifg=#80a090 guibg=#313c36 gui=none
-hi DiffAdd ctermfg=108 ctermbg=22 cterm=none
+hi DiffAdd ctermfg=fg ctermbg=22 cterm=none
" changed line
hi DiffChange guifg=NONE guibg=#4a343a gui=none
hi DiffChange ctermfg=fg ctermbg=52 cterm=none
" deleted line
hi DiffDelete guifg=#6c6661 guibg=#3c3631 gui=none
-hi DiffDelete ctermfg=59 ctermbg=58 cterm=none
+hi DiffDelete ctermfg=fg ctermbg=58 cterm=none
" changed text within line
hi DiffText guifg=#f05060 guibg=#4a343a gui=bold
-hi DiffText ctermfg=203 ctermbg=52 cterm=bold
+hi DiffText ctermfg=203 ctermbg=52 cterm=bold
" Folds
" -----
" line used for closed folds
-hi Folded guifg=#91d6f8 guibg=#363946 gui=none
-hi Folded ctermfg=117 ctermbg=238 cterm=none
+"hi Folded guifg=#91d6f8 guibg=#363946 gui=none
+"hi Folded ctermfg=117 ctermbg=238 cterm=none
+hi Folded guifg=#d0e0f0 guibg=#202020 gui=none
+hi Folded ctermfg=117 ctermbg=235 cterm=none
" column on side used to indicated open and closed folds
hi FoldColumn guifg=#91d6f8 guibg=#363946 gui=none
+hi FoldColumn guifg=#c0c0d0 guibg=#363946 gui=none
hi FoldColumn ctermfg=117 ctermbg=238 cterm=none
@@ -344,3 +350,4 @@ hi Visual ctermfg=NONE ctermbg=24
" visual mode selection when vim is not owning the selection (x11 only)
hi VisualNOS guifg=fg gui=underline
hi VisualNOS ctermfg=fg cterm=underline
+
File renamed without changes.
@@ -0,0 +1,98 @@
+" Maintainer: Mario Gutierrez (mario@mgutz.com)
+" Original Theme: Dmitry Kichenko (dmitrykichenko@gmail.com)
+" Last Change: Jun 23, 2010
+
+set background=dark
+
+hi clear
+
+if exists("syntax_on")
+ syntax reset
+endif
+
+let colors_name = "underwater-mod"
+
+" Vim >= 7.0 specific colors
+if version >= 700
+ " highlights current line
+ hi CursorLine guibg=#18374F
+ " cursor's colour
+ hi CursorColumn guibg=#ffffff
+ "hi MatchParen guifg=#ffffff guibg=#439ea9 gui=bold
+ hi MatchParen guifg=magenta guibg=bg gui=bold
+ hi Pmenu guifg=#dfeff6 guibg=#1E415E
+ hi PmenuSel guifg=#dfeff6 guibg=#2D7889
+
+ " Search
+ hi IncSearch guifg=#E2DAEF guibg=#AF81F4 gui=bold
+ hi Search guifg=#E2DAEF guibg=#AF81F4 gui=none
+endif
+
+" General colors
+hi Cursor guifg=NONE guibg=#55A096 gui=none
+"hi Normal guifg=#e3f3fa guibg=#102235 gui=none
+hi Normal guifg=#e3f3fa guibg=#0B1724 gui=none
+" e.g. tildes at the end of file
+hi NonText guifg=#2F577C guibg=bg gui=none
+hi LineNr guifg=#233f59 guibg=bg gui=none
+hi StatusLine guifg=#ffec99 guibg=#0a1721 gui=none
+hi StatusLineNC guifg=#233f59 guibg=#0a1721 gui=none
+hi VertSplit guifg=#0a1721 guibg=#0a1721 gui=none
+hi Folded guifg=#68CEE8 guibg=#1A3951 gui=none
+hi FoldColumn guifg=#1E415E guibg=#1A3951 gui=none
+hi Title guifg=cyan guibg=NONE gui=bold
+ " Selected text color
+hi Visual guifg=#dfeff6 guibg=#24557A gui=none
+"hi SpecialKey guifg=#3e71a1 guibg=#102235 gui=none
+
+" Syntax highlighting
+"
+hi Comment guifg=#3e71a1 guibg=bg gui=italic
+hi Todo guifg=#ADED80 guibg=#579929 gui=bold
+hi Constant guifg=#96defa gui=none
+hi String guifg=#89e14b gui=italic
+ " names of variables in PHP
+hi Identifier guifg=#8ac6f2 gui=none
+ " Function names as in python. currently purleish
+hi Function guifg=#AF81F4 gui=none
+ " declarations of type, e.g. int blah
+hi Type guifg=#41B2EA gui=none
+ " statement, such as 'hi' right here
+hi Statement guifg=#68CEE8 gui=none
+hi Keyword guifg=#8ac6f2 gui=none
+ " specified preprocessed words (like bold, italic etc. above)
+hi PreProc guifg=#ef7760 gui=none
+hi Number guifg=#96defa gui=none
+hi Special guifg=#DFEFF6 gui=none
+
+" Ruby
+hi rubyInterpolation guifg=#b9e19d guibg=bg
+hi rubyInterpolationDelimiter guifg=#b9e19d guibg=bg
+hi link rubyStringDelimiter String
+""hi erubyDelimiter guifg=#f8c6bd guibg=bg
+hi link erubyDelimiter PreProc
+
+" HTML
+hi link htmlTag Statement
+hi link htmlEndTag Statement
+hi link htmlTagName Statement
+
+" XML
+hi link xmlTag htmlTag
+hi link xmlEndTag htmlEndTag
+hi link xmlTagName htmlTagName
+
+" NERDTree
+hi link treePart LineNr
+hi link treePartFile treePart
+hi link treeDirSlash treePart
+hi link treeDir Statement
+hi link treeClosable PreProc
+hi link treeOpenable treeClosable
+hi link treeUp treeClosable
+hi treeFlag guifg=#3e71a1 guibg=bg gui=none
+hi link treeHelp Comment
+hi link treeLink Type
+
+hi link markdownCode Function
+hi link markdownCodeBlock Function
View
@@ -0,0 +1,68 @@
+" rob.robb.ns
+" Last Change: 3 sep 2009
+
+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=#141414 guibg=#d5dcee
+hi CursorLine guifg=#424242 guibg=#d5dcee
+hi Directory guifg=#8F9D6A guibg=#141414
+hi VertSplit guifg=#d5dcee guibg=#d5dcee
+hi Folded guifg=#888888 guibg=#282828
+hi FoldColumn guifg=#cf6a4c guibg=#141414 gui=italic
+hi vimFold guifg=#f8f8f8 guibg=#282828 gui=italic
+hi IncSearch guifg=#4f94cd guibg=#f8f8f8
+hi LineNr guifg=#665f57 guibg=#141414
+hi ModeMsg guifg=#f9ee98 guibg=#141414
+hi MoreMsg guifg=#f9ee98 guibg=#141414
+hi NonText guifg=#665f57 guibg=#141414
+hi Search guifg=#f8f8f8 guibg=#4f94cd gui=underline
+hi StatusLine guifg=#0e2231 guibg=#8693a5
+hi StatusLineNC guifg=#0e2231 guibg=#8693a5
+hi Visual guifg=#141414 guibg=#d5dcee gui=italic
+hi WildMenu guifg=#9b70f3 guibg=#0e2231
+hi MatchParen guifg=#f8f8f8 guibg=#4f94cd
+hi ErrorMsg guifg=#cf6a4c guibg=NONE
+hi WarningMsg guifg=#cf6a4c guibg=NONE
+hi Title guifg=#cf6a4c guibg=#141414
+
+"Syntax hilight groups
+
+hi Comment guifg=#665f57 gui=italic
+hi Constant guifg=#7587a6 gui=bold
+hi Exception guifg=#cf6a4c
+hi String guifg=#8f9d6a
+hi Variable guifg=#7587a6 gui=bold
+hi Number guifg=#cf6a4c
+hi Define guifg=#7587a6
+hi Boolean guifg=#CF6A4C
+hi Float guifg=#cf6a4c
+hi Identifier guifg=#7587a6 gui=bold
+hi Statement guifg=#cda869
+hi Keyword guifg=#cda869 gui=bold
+hi PreProc guifg=#7587a6
+hi Type guifg=#9b859d gui=bold
+hi Typedef guifg=#cda869
+hi Special guifg=#cda869
+hi SpecialChar guifg=#7587a6
+hi SpecialComment guifg=#4f94cd
+hi Ignore guifg=#888888
+hi Error guifg=#cf6a4c guibg=NONE gui=underline
+hi Todo guifg=#141414 guibg=#f9ee98
+hi Pmenu guifg=#8693a5 guibg=#0e2231
+hi PmenuSel guifg=#cda869 guibg=#0e2231
+hi PmenuSbar guibg=#665f57
+hi PmenuThumb guifg=#a6a6a6
+
+"diff
+
+hi DiffAdd guifg=#8f9d6a guibg=#282828
+hi DiffChange guifg=#cda869 guibg=#282828
+hi DiffText guifg=#f8f8f8 guibg=#282828
+hi DiffDelete guifg=#cf6a4c guibg=#282828
View
@@ -0,0 +1,11 @@
+sqlalchemy
+SQLAlchemy
+sessionmaker
+Metadata
+metadata
+metadata
+config
+hostname
+app
+Ubuntu
+blog
Oops, something went wrong.

0 comments on commit ce22760

Please sign in to comment.