summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitconfig4
-rw-r--r--.vimrc12
-rw-r--r--README.md17
3 files changed, 25 insertions, 8 deletions
diff --git a/.gitconfig b/.gitconfig
index e4dca34..65d0e58 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -9,4 +9,6 @@
[diff]
tool = vimdiff
[difftool]
- prompt = false
+ prompt = false
+[color]
+ ui = true
diff --git a/.vimrc b/.vimrc
index b0faa2d..55925b5 100644
--- a/.vimrc
+++ b/.vimrc
@@ -36,6 +36,10 @@ set nocompatible " make vim less vi
" tagbar
let g:tagbar_ctags_bin='~/.vim/bin/ctags'
+ " CtrlP
+ let g:ctrlp_buftag_ctags_bin='~/.vim/bin/ctags'
+ let g:ctrlp_extensions = ['buffertag', 'line', 'changes', 'mixed']
+
" omni complete
" add tags
" set tags+=~/.vim/tags/cpp_tags
@@ -53,6 +57,14 @@ set nocompatible " make vim less vi
"}}}
+function! TriggerSCons(arg_string)
+ let base_cmd = "scons -u "
+ let &makeprg=base_cmd.a:arg_string
+ make
+endfunction
+" use like :SCons -j20 ...
+command! -nargs=1 SCons call TriggerSCons(<f-args>)
+
" +----------------------------+
" | Color Settings |
" +----------------------------+
diff --git a/README.md b/README.md
index 6a22c80..7cb21fb 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,17 @@
# author: johannst
- **.vim/colors**:
- - solarized: https://github.com/altercation/solarized
- - buddy : https://github.com/DrSpatula/vim-buddy
- - gruvbox : https://github.com/morhetz/gruvbox
- - pride : https://github.com/lyxell/pride.vim
- - scheakur : https://github.com/scheakur/vim-scheakur
+ - solarized: https://github.com/altercation/solarized
+ - buddy : https://github.com/DrSpatula/vim-buddy
+ - gruvbox : https://github.com/morhetz/gruvbox
+ - pride : https://github.com/lyxell/pride.vim
+ - scheakur : https://github.com/scheakur/vim-scheakur
- **.vim/install_vundle.sh**:
- - Installs Vim Bundle package manager
+ - Installs Vim Bundle package manager
- **.bashrc/**
- - this files should be sourced from within a ~/.bashrc ~/.bash_profile file
+ - this files should be sourced from within a ~/.bashrc ~/.bash_profile file
+
+- **.Xresources_solarized**
+ - https://github.com/solarized/xresources