diff options
| author | Urbain Vaes <urbain@vaes.uk> | 2015-04-16 19:38:26 +0100 |
|---|---|---|
| committer | Urbain Vaes <urbain@vaes.uk> | 2015-04-16 19:38:26 +0100 |
| commit | 7f85709d1fe140a885542b1498c5de4d86f6f12c (patch) | |
| tree | fbdb6dbf8d5b86d14fc69881308bb46ca00330fd /vim | |
| parent | 5a70175728af9693730e721fa2fb02f9cc4ef064 (diff) | |
| parent | d85c5ee10c953f05d624f3494438a1612b0f8e92 (diff) | |
Merge branch 'master' of github.com:uvaes/dotfiles
Diffstat (limited to 'vim')
| -rw-r--r-- | vim/mySnippets/cpp.snippets | 0 | ||||
| -rw-r--r-- | vim/vimrc | 11 |
2 files changed, 4 insertions, 7 deletions
diff --git a/vim/mySnippets/cpp.snippets b/vim/mySnippets/cpp.snippets new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/vim/mySnippets/cpp.snippets @@ -13,6 +13,9 @@ Plugin 'gregsexton/gitv' Plugin 'UltiSnips' Plugin 'kien/ctrlp.vim' Plugin 'tpope/vim-surround' +Plugin 'tpope/vim-obsession' +Plugin 'tpope/vim-sensible' +Plugin 'tpope/vim-scriptease' Plugin 'scrooloose/nerdtree' Plugin 'tommcdo/vim-exchange' Plugin 'unimpaired.vim' @@ -82,12 +85,10 @@ let g:ctrlp_show_hidden = 1 " Tabs and indent set smartindent -set nosmarttab set expandtab set tabstop=4 set softtabstop=4 set shiftwidth=4 -set autoindent " Folds set foldcolumn=0 @@ -97,7 +98,6 @@ set foldlevel=0 " Search set hlsearch -set incsearch " Back up files set noswapfile @@ -107,8 +107,6 @@ set undodir=/home/urbain/.vim/vimundo/ " Layout window set nonumber -set ruler -set showcmd set listchars=tab:▸\ ,eol:¬,trail:- set fillchars=fold:\ ,vert:\ , set showbreak=\ \ \ \ \ \ ... @@ -139,14 +137,13 @@ set ignorecase " General set noautochdir -set wildmenu set cpoptions+=I set encoding=utf-8 "" Colorscheme function! UpdateColorscheme() try | colorscheme solarized | catch | endtry - if strftime("%H") >= 8 && strftime("%H") < 20 + if strftime("%H") >= 8 && strftime("%H") < 21 set background=light else set background=dark |