Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Funkmyster/Terminal
base: ab3eb9422c
...
head fork: Funkmyster/Terminal
compare: ab41263754
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 19 additions and 8 deletions.
  1. +1 −1  git/gitconfig
  2. +18 −7 vim/vimrc
View
2  git/gitconfig
@@ -1,6 +1,6 @@
[user]
name = Jacob Silva
- email = questforall@gmail.com
+ email = jacob@funkmyster.com
[color]
ui = auto
View
25 vim/vimrc
@@ -14,7 +14,11 @@ Bundle 'tpope/vim-fugitive'
Bundle 'tpope/vim-markdown'
Bundle 'nvie/vim-rst-tables'
Bundle 'vimoutliner/vimoutliner'
-Bundle 'vim-scripts/vcscommand.vim'
+Bundle 'scrooloose/nerdtree'
+
+Bundle 'Lokaltog/powerline'
+Bundle 'scrooloose/syntastic'
+Bundle 'kien/ctrlp.vim'
" ...
@@ -29,12 +33,20 @@ filetype plugin indent on " required!
" see :h vundle for more details or wiki for FAQ
" NOTE: comments after Bundle command are not allowed..
-
-set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)\ -\ %{v:servername}
-
-set showcmd "Show (partial) command in status line"
set laststatus=2 "Always disp statusline"
-set statusline=%F%m%r%h%w\ [FILETYPE=%Y]\[LINE=%04l][%p%%]
+if has("gui_running")
+ colorscheme evening
+ set rtp+=~/Libs/Terminal/vim/vim/bundle/powerline/powerline/bindings/vim
+ set guioptions-=m "remove menu bar
+ set guioptions-=T "remove toolbar
+ set guioptions-=r "remove right-hand scroll bar
+else
+ colorscheme default
+ set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)\ -\ %{v:servername}
+ set showcmd "Show (partial) command in status line"
+ set statusline=%F%m%r%h%w\ [FILETYPE=%Y]\[LINE=%04l][%p%%]
+endif
+
set smarttab
set autoindent
@@ -57,7 +69,6 @@ set noswapfile
set undoreload=0 "now use :edit to reset undo history for file"
-colorscheme default
syntax on "turn on syntax highlighting

No commit comments for this range

Something went wrong with that request. Please try again.