Permalink
Browse files

Fixed the git clone issue, changed the theme to tomorrow, added vim-c…

…onque, added some speed fixes in the vimrc and revved many of the submodules.
  • Loading branch information...
johnhamelink committed May 3, 2012
1 parent f7aa731 commit 257a3d5f9494198f58a2e34698e6872797cf4ee8
Showing with 34 additions and 17 deletions.
  1. +10 −1 .gitmodules
  2. +1 −1 bundle/MRU
  3. +1 −0 bundle/blade.vim
  4. +1 −0 bundle/ctrlp
  5. +1 −1 bundle/fugitive
  6. +1 −1 bundle/gist
  7. +1 −1 bundle/git-addon-mw-utils
  8. +1 −1 bundle/haml
  9. +1 −1 bundle/jade
  10. +1 −1 bundle/javascript
  11. +1 −1 bundle/snipmate-snippets
  12. +1 −1 bundle/stylus
  13. +1 −1 bundle/syntastic
  14. +1 −1 bundle/threesome
  15. +1 −0 bundle/vim-conque
  16. +1 −0 bundle/vim-tomorrow-theme
  17. +1 −1 bundle/zencoding
  18. +8 −4 vimrc
View
@@ -87,4 +87,13 @@
url = https://github.com/skammer/vim-css-color.git
[submodule "bundle/phpdoc"]
path = bundle/phpdoc
- url = git@github.com:johnhamelink/PhpDoc.git
+ url = https://github.com/johnhamelink/PhpDoc.git
+[submodule "bundle/vim-tomorrow-theme"]
+ path = bundle/vim-tomorrow-theme
+ url = https://github.com/chriskempson/vim-tomorrow-theme.git
+[submodule "bundle/vim-conque"]
+ path = bundle/vim-conque
+ url = https://github.com/rygwdn/vim-conque.git
+[submodule "bundle/blade.vim"]
+ path = bundle/blade.vim
+ url = git://github.com/johnhamelink/blade.vim.git
Submodule MRU updated 1 files
+109 −52 plugin/mru.vim
Submodule blade.vim added at 6ce7a5
Submodule ctrlp added at 8820de
Submodule fugitive updated 2 files
+25 −4 doc/fugitive.txt
+137 −53 plugin/fugitive.vim
Submodule gist updated 2 files
+7 −3 autoload/gist.vim
+4 −1 gist.vim.vimup
Submodule haml updated 1 files
+1 −1 ftdetect/haml.vim
Submodule jade updated from b917bf to d63c1e
Submodule stylus updated 2 files
+1 −1 syntax/stylus.vim
+2 −3 test.styl
Submodule vim-conque added at 6f563b
Submodule vim-tomorrow-theme added at 00f834
View
12 vimrc
@@ -3,7 +3,7 @@
" => pathogen bundles
""""""""""""""""""""""""""""""
filetype off " Turn off filetype while we run the bundles
-call pathogen#helptags() " Generate all the helpfiles
+"call pathogen#helptags() " Generate all the helpfiles
call pathogen#runtime_append_all_bundles() " Run the bundles
filetype on " Turn filetype on again
@@ -13,9 +13,12 @@ filetype on " Turn filetype on again
""""""""""""""""""""""""""""""
syntax on " Syntax mode!
filetype plugin indent on " We want indenting
-set nocompatible " We don't need strict vi compatibility.
-set ttyfast " Tells vim we have a fast connection to the terminal
+set nocompatible " We don't need strict vi compatibility.
+set ttyfast " Tells vim we have a fast connection to the terminal
set clipboard=unnamed " Allows you to copy/paste from within the terminal
+set ttimeout " Makes vim play nicely with tmux
+set ttimeoutlen=25 " Makes vim play nicely with tmux0
+set notimeout " Makes vim play nicely with tmux
""""""""""""""""""""""""""""""
@@ -129,7 +132,8 @@ endfunction
""""""""""""""""""""""""""""""
" => Colour Schemes
""""""""""""""""""""""""""""""
-colorscheme mustang " Set the theme to mustang
+"colorscheme mustang " Set the theme to mustang
+colorscheme Tomorrow-Night-Bright
if has("gui_macvim") " If we're running Macvim
set fuopt+=maxhorz " Get rid of menubars that are visible by default.

0 comments on commit 257a3d5

Please sign in to comment.