Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update submodules and change default theme

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

0 comments on commit 46000fe

Please sign in to comment.
Something went wrong with that request. Please try again.