From d68286fc99c629ceeb061fafdcf3f88f9de3261e Mon Sep 17 00:00:00 2001
From: Julian T <julian@jtle.dk>
Date: Sat, 12 Oct 2019 19:05:08 +0200
Subject: Vim colors and new terminal

---
 i3/.xinitrc |  4 ++--
 vim/.vimrc  | 73 ++++++++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/i3/.xinitrc b/i3/.xinitrc
index 21ac648..e53275b 100644
--- a/i3/.xinitrc
+++ b/i3/.xinitrc
@@ -1,8 +1,8 @@
 setxkbmap -layout us -variant altgr-intl
 export _JAVA_AWT_WM_NONREPARENTING=1
 feh --bg-tile /home/julian/Pictures/defaultWall.*
-export TERM=st
-export TERMINAL=st
+export TERM=xfce4-terminal
+export TERMINAL=xfce4-terminal
 
 dbus-update-activation-environment --systemd DISPLAY
 
diff --git a/vim/.vimrc b/vim/.vimrc
index fc20a88..3a91ff4 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -29,33 +29,31 @@ set shellslash
 	" Color theme
 	" Plugin 'agude/vim-eldar'
 	" Plugin 'ntk148v/vim-horizon'
-	Plugin 'rakr/vim-colors-rakr'
+	" Plugin 'rakr/vim-colors-rakr'
+	Plugin 'rakr/vim-one'
+	Plugin 'ntk148v/vim-horizon'
 
 	" File management
 	" Plugin 'scrooloose/nerdtree'
-	Plugin 'tpope/vim-vinegar'
+	" Plugin 'tpope/vim-vinegar'
 
 	" Git
-	" Plugin 'jreybert/vimagit'
+	Plugin 'jreybert/vimagit'
+	Plugin 'tpope/vim-fugitive'
 	
 	" File support
 	Plugin 'cespare/vim-toml'
-	Plugin 'vim-scripts/TagHighlight'
+	" Plugin 'vim-scripts/TagHighlight'
 	Plugin 'lervag/vimtex'
 	Plugin 'LnL7/vim-nix'
+	" Plugin 'rust-lang/rust.vim'
+	" Plugin 'racer-rust/vim-racer'
 
 	Plugin 'junegunn/vim-easy-align'
 	call vundle#end()            " required
 	filetype plugin indent on    " required
 
 
-colorscheme rakr
-
-" Start interactive EasyAlign in visual mode (e.g. vipga)
-xmap ga <Plug>(EasyAlign)
-
-" Start interactive EasyAlign for a motion/text object (e.g. gaip)
-nmap ga <Plug>(EasyAlign)
 
 " Completion
 	" let g:LanguageClient_serverCommands = {
@@ -68,9 +66,14 @@ nmap ga <Plug>(EasyAlign)
 	" let g:deoplete#enable_at_startup = 1
 	let g:go_def_mode='gopls'
 	let g:go_info_mode='gopls'
-	let b:vcm_tab_complete = 'omni'
+	" let g:rustfmt_autosave = 1
+
+	autocmd FileType c let b:vcm_tab_complete = 'omni'
+	autocmd FileType go let b:vcm_tab_complete = 'omni'
 	autocmd FileType vim let b:vcm_tab_complete = 'vim'
 
+	set completeopt=menuone
+
 syntax enable
 set number relativenumber
 
@@ -97,16 +100,15 @@ set hidden
 	" If you want :UltiSnipsEdit to split your window.
 	" let g:UltiSnipsEditSplit="vertical"
 
-
 " File finding
 	set path+=**
 	set wildmenu
 
-	let g:netrw_liststyle=3
+	let g:netrw_liststyle=2
+	let g:netrw_banner = 0
 
 " autocmd BufEnter * call ncm2#enable_for_buffer()
 " let g:ncm2#auto_popup = 0
-set completeopt=menuone,preview
 
 " Keymapping
 	map <F4> :TagbarToggle<CR>
@@ -117,8 +119,14 @@ set completeopt=menuone,preview
 	nnoremap <silent> <Plug>QuickPrev :cprev<CR> :call repeat#set("\<Plug>QuickPrev")<CR>
 	nnoremap ,, :copen<CR><c-w><c-p>
 
-	nmap ,n <Plug>QuickNext
-	nmap ,N <Plug>QuickPrev
+	cnoreabbrev ln lnext
+	cnoreabbrev lp lprev
+	cnoreabbrev cn cnext
+	cnoreabbrev cp cprev
+
+	nmap <C-j> <Plug>QuickNext
+	nmap <C-k> <Plug>QuickPrev
+	nmap - :Exp<CR>
 
 	" 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
@@ -135,17 +143,33 @@ set completeopt=menuone,preview
 		" autocmd FileType tex map <leader>o :w !detex \| wc -w<CR>
 		autocmd FileType asciidoc nnoremap <leader>c :!asciidoctor %<CR>
 
+		" Start interactive EasyAlign in visual mode (e.g. vipga)
+		xmap ga <Plug>(EasyAlign)
+
+		" Start interactive EasyAlign for a motion/text object (e.g. gaip)
+		nmap ga <Plug>(EasyAlign)
+
 " Enforcing filetypes
 	autocmd BufRead,BufNewFile *.ino set filetype=c
 	autocmd BufRead,BufNewFile *.asc set filetype=asciidoc
 	autocmd FileType python setlocal completeopt-=preview
 
 " Highlightning
-	let g:DoNotGenerateTags = 1
-	" Remove pink color from functions
-	highlight clear Function
-	" Remove color from struct members
-	highlight link Member NonText
+	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
 
 
 " Spell check
@@ -168,3 +192,8 @@ set completeopt=menuone,preview
         \   '-synctex=1',
         \ ],
         \}
+
+" Terrible oneliner for debugging color highlightning
+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