From b3ed67fc9d364a7eeb4bfdbc11ea621913bcfe03 Mon Sep 17 00:00:00 2001
From: Julian T <julian@jtle.dk>
Date: Mon, 16 Dec 2019 13:21:30 +0100
Subject: Vim stuff and vim colorscheme

---
 vim/.vimrc | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

(limited to 'vim')

diff --git a/vim/.vimrc b/vim/.vimrc
index 089c7b4..ffebaa1 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -31,7 +31,8 @@ set shellslash
 	" Plugin 'ntk148v/vim-horizon'
 	" Plugin 'rakr/vim-colors-rakr'
 	Plugin 'rakr/vim-one'
-	Plugin 'ntk148v/vim-horizon'
+	Plugin 'morhetz/gruvbox'
+	" Plugin 'ntk148v/vim-horizon'
 
 	" File management
 	" Plugin 'scrooloose/nerdtree'
@@ -48,12 +49,14 @@ set shellslash
 	Plugin 'LnL7/vim-nix'
 	" Plugin 'rust-lang/rust.vim'
 	" Plugin 'racer-rust/vim-racer'
+	
+
+	" Snippets are separated from the engine. Add this if you want them:
+	Plugin 'honza/vim-snippets'
 
 	call vundle#end()            " required
 	filetype plugin indent on    " required
 
-
-
 " Completion
 	" let g:LanguageClient_serverCommands = {
 	" 	\ 'rust': ['/usr/bin/rustup', 'run', 'stable', 'rls' ],
@@ -127,9 +130,10 @@ set hidden
 	nmap <C-j> <Plug>QuickNext
 	nmap <C-k> <Plug>QuickPrev
 	" nnoremap <C-h> :LspHover<CR>
-	nmap - :Exp<CR>
-	cnoreabbrev instime put =strftime('%Y-%m-%dT%I%M')
 
+	let g:UltiSnipsExpandTrigger="<C-s>"
+	let g:UltiSnipsJumpForwardTrigger="<c-b>"
+	let g:UltiSnipsJumpBackwardTrigger="<c-z>"
 
 	" When moving more lines make it a jump. If couns i 2 it will run m'2j,
 	" thus storing it on the jumplist and then jumping
@@ -173,21 +177,10 @@ set hidden
 	autocmd BufRead,BufNewFile *.asc set filetype=asciidoc
 
 " Highlightning
-	if (empty($TMUX))
-		if (has("nvim"))
-			"For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
-			let $NVIM_TUI_ENABLE_TRUE_COLOR=1
-		endif
-		"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
-		"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
-		" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
-		if (has("termguicolors"))
-			set termguicolors
-		endif
-	endif
-	set background=dark
-	let g:one_allow_italics = 1
-	colorscheme one
+	set termguicolors
+	" let g:one_allow_italics = 1
+	let g:gruvbox_italic = 1
+	colorscheme gruvbox
 
 
 " Spell check
@@ -215,3 +208,4 @@ set hidden
 map <F10> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
 \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
 \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
+
-- 
cgit v1.2.3