Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update submodules and change default theme

  • Loading branch information...
commit 46000fee3438873fa1757fe6b334cdb4d56dd366 1 parent 338e4d3
Shawn Biddle authored
3  .gitmodules
View
@@ -37,3 +37,6 @@
[submodule ".vim/bundle/powerline.git"]
path = .vim/bundle/powerline.git
url = https://github.com/Lokaltog/vim-powerline.git
+[submodule ".vim/bundle/skittles_berry.git"]
+ path = .vim/bundle/skittles_berry.git
+ url = git://github.com/shawncplus/skittles_berry.git
2  .vim/bundle/NERDtree
@@ -1 +1 @@
-Subproject commit 8b7004c20a18277a94261dc20ad3a45950265bc2
+Subproject commit af65bd23e69a3a5fc1a39eb47733191b7110bb1e
2  .vim/bundle/NERDtree.git
@@ -1 +1 @@
-Subproject commit 30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc
+Subproject commit a1433c485eb254838c1db52e087d5ec4d1e77cfd
2  .vim/bundle/badwolf.git
@@ -1 +1 @@
-Subproject commit 4337437dc0a40a02be78911dc6bf6fee5129bb1f
+Subproject commit 03ac89e057224c9d3adf000960c62b3293d47ae0
2  .vim/bundle/easymotion.git
@@ -1 +1 @@
-Subproject commit dfb8079d8c29008e2b15a24de3edf24ba00a1bbc
+Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4
2  .vim/bundle/fugitive.vim
@@ -1 +1 @@
-Subproject commit a38f25f78b429ccad1e2d2da82efb9678f34675d
+Subproject commit a90cc48c7a7b41ce366a07f91ccedc82cf2d0c1a
2  .vim/bundle/gitv.git
@@ -1 +1 @@
-Subproject commit 242bf537a0158f1cf1417fecd9dfbbc9fe0054f4
+Subproject commit 582e32b9e387dd6f2d8f69ceb5416b555efb80e3
2  .vim/bundle/powerline.git
@@ -1 +1 @@
-Subproject commit ca8b897f67e8e15cf39a308ca012c5a53929d10d
+Subproject commit 7f53b5c3919bde9a4259d0c725d453ef2337a4ed
1  .vim/bundle/skittles_berry.git
@@ -0,0 +1 @@
+Subproject commit bfd300f3722cbd6ecea1972f425aa93d6c53f6a6
2  .vim/bundle/threesome.vim
@@ -1 +1 @@
-Subproject commit 99c4cf09871c72f1d02819d3a8663a1df869aa02
+Subproject commit 2591552f23217c5168d4c872789a76108e59a2f0
2  .vim/bundle/vcscommand.vim
@@ -1 +1 @@
-Subproject commit 82d53735e334fa6cebea10c3d7bd0f630a8eb6f9
+Subproject commit 8446fb6301281b8a033678a96a6890dc1a75a7ac
2  .vim/bundle/zencoding.vim
@@ -1 +1 @@
-Subproject commit fdb91b19c83cf10c14642269e5a56b4751829d90
+Subproject commit 37cb477bb1fc948d88de9feccc5754af3b708ae9
4 .vim/startup/color.vim
View
@@ -4,6 +4,4 @@
"color railscasts
"color molokai
"color skittles_dark
-color badwolf
-
-
+color skittles_berry
43 .vim/startup/functions.vim
View
@@ -12,16 +12,16 @@ fun! Format_Inflection_ToUnderscored()
endfun
fun! CheckTabs()
- if search("\t") != 0
- echohl ErrorMsg | ec " !WARNING! "
- \ | ec "There are tabs in the file, do you want to convert them to spaces? [Y/n]" | echohl None
- let choice = nr2char(getchar())
- if choice == 'y' || choice == "\<CR>"
- retab 2
- endif
- else
- return
- endif
+ if search("\t") != 0
+ echohl ErrorMsg | ec " !WARNING! "
+ \ | ec "There are tabs in the file, do you want to convert them to spaces? [Y/n]" | echohl None
+ let choice = nr2char(getchar())
+ if choice == 'y' || choice == "\<CR>"
+ retab 2
+ endif
+ else
+ return
+ endif
endfun
function! EnsureDirExists ()
@@ -33,7 +33,26 @@ endfunction
" screen stuff
fun! s:Sinit(filen)
- echo expand(a:filen)
- exec "ScreenShell cd " . expand(a:filen) . "; \\clear"
+ echo expand(a:filen)
+ exec "ScreenShell cd " . expand(a:filen) . "; \\clear"
endfun
+""" FocusMode
+function! ToggleFocusMode()
+ if (&foldcolumn != 12)
+ set laststatus=0
+ set numberwidth=10
+ set foldcolumn=12
+ set noruler
+ hi FoldColumn ctermbg=none
+ hi LineNr ctermfg=0 ctermbg=none
+ hi NonText ctermfg=0
+ else
+ set laststatus=2
+ set numberwidth=4
+ set foldcolumn=0
+ set ruler
+ colorscheme skittles_berry "re-call your colorscheme
+ endif
+endfunc
+nnoremap <F1> :call ToggleFocusMode()<cr>
11 .vim/startup/settings.vim
View
@@ -15,6 +15,7 @@ set nowrap
if &diff
set wrap
endif
+let &scrolloff=999-&scrolloff
set completeopt=menu
set mousemodel=popup
@@ -29,6 +30,7 @@ set noexpandtab
set tabstop=4
set shiftwidth=4
set foldcolumn=1
+set cc=+1,+2
set linespace=0
set history=1000
@@ -50,4 +52,13 @@ if version > 720
endif
let mapleader='\'
+if exists('$TMUX')
+ let &t_SI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=1\x7\<Esc>\\"
+ let &t_EI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=0\x7\<Esc>\\"
+else
+ let &t_SI = "\<Esc>]50;CursorShape=1\x7"
+ let &t_EI = "\<Esc>]50;CursorShape=0\x7"
+endif
+let g:Powerline_symbols = 'fancy'
+call Pl#Theme#InsertSegment('ws_marker', 'after', 'lineinfo')
4 .vimrc
View
@@ -26,3 +26,7 @@ source ~/.vim/startup/js.vim
source ~/.vim/startup/php.vim
source ~/.vim/startup/vim.vim
source ~/.vim/startup/yaml.vim
+
+if &diff
+ color skittles_dark
+endif
Please sign in to comment.
Something went wrong with that request. Please try again.