From f42c8e0a3eadaedc9da94a0e972ed3ad124b475f Mon Sep 17 00:00:00 2001
From: Geoffrey Frogeye <geoffrey@frogeye.fr>
Date: Mon, 13 Feb 2017 06:40:24 +0100
Subject: [PATCH] Things again

---
 bashrc             |  2 +-
 config/htop/htoprc |  2 +-
 vimrc              | 40 ++++++++++++++++------------------------
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/bashrc b/bashrc
index 837c5b9..ce2bf9e 100644
--- a/bashrc
+++ b/bashrc
@@ -11,7 +11,7 @@ export TZ=/usr/share/zoneinfo/Europe/Paris
 # Favourite commands
 export PAGER=less
 export EDITOR=vim
-export VISUAL=gvim
+export VISUAL=vim
 export BROWSER=qutebrowser
 
 # Some programs need those changes
diff --git a/config/htop/htoprc b/config/htop/htoprc
index 51bf9c4..882a239 100644
--- a/config/htop/htoprc
+++ b/config/htop/htoprc
@@ -1,7 +1,7 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
 fields=0 48 17 18 38 39 40 2 46 47 49 1 
-sort_key=47
+sort_key=46
 sort_direction=1
 hide_threads=0
 hide_kernel_threads=0
diff --git a/vimrc b/vimrc
index b79815c..e5df06c 100644
--- a/vimrc
+++ b/vimrc
@@ -14,8 +14,8 @@ Plugin 'gmarik/Vundle.vim'
 Plugin 'L9'
 Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
 Plugin 'tomasr/molokai'
-Bundle 'Shougo/neosnippet'
-Bundle 'Shougo/neosnippet-snippets'
+"Bundle 'Shougo/neosnippet'
+"Bundle 'Shougo/neosnippet-snippets'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
@@ -24,22 +24,23 @@ Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
 Plugin 'kien/ctrlp.vim'
 Plugin 'mbbill/undotree'
-"Plugin 'scrooloose/nerdtree'
-"Plugin 'Xuyuanp/nerdtree-git-plugin'
 Plugin 'xolox/vim-misc'
 Plugin 'xolox/vim-easytags'
 Plugin 'majutsushi/tagbar'
-"Plugin 'gilligan/vim-lldb'
 Plugin 'wellle/targets.vim'
 Plugin 'Chiel92/vim-autoformat'
 Plugin 'Valloric/YouCompleteMe'
-"Plugin 'Raimondi/delimitMate'
-"Plugin 'Cocophotos/vim-ycm-latex-semantic-completer'
-"Plugin 'IN3D/vim-raml'
+Plugin 'artur-shaik/vim-javacomplete2'
+Plugin 'tomtom/tcomment_vim'
+Plugin 'Shougo/denite.nvim'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
 
+""" UNDOTREE """
+
+nmap <F7> :UndotreeToggle<CR>:UndotreeFocus<CR>
+
 """ CTRLP """
 
 let g:ctrlp_custom_ignore = {
@@ -48,6 +49,10 @@ let g:ctrlp_custom_ignore = {
     \ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
     \ }
 
+""" TAGBAR """
+
+nmap <F8> :TagbarToggle<CR>
+
 """ VIM-AIRLINE """
 
 set noshowmode
@@ -61,24 +66,13 @@ let g:airline_section_b = airline#section#create(['branch', 'hunks'])
 let g:airline_section_z = airline#section#create(['%B', '@', '%l', ':', '%c'])
 let g:airline_theme = 'wombat'
 
-""" NERDTREE-GIT-PLUGIN """
-
-let g:NERDTreeIndicatorMapCustom = {
-    \ "Modified"  : "✹",
-    \ "Staged"    : "✚",
-    \ "Untracked" : "✭",
-    \ "Renamed"   : "➜",
-    \ "Unmerged"  : "═",
-    \ "Deleted"   : "✖",
-    \ "Dirty"     : "✗",
-    \ "Clean"     : "✔︎",
-    \ "Unknown"   : "?"
-    \ }
-
 """ YOUCOMPLETEME """
 
 let g:ycm_global_ycm_extra_conf = '~/.config/ycm_extra_conf.py'
 
+""" JAVACOMPLETE """
+
+autocmd FileType java setlocal omnifunc=javacomplete#Complete
 
 """ VIM SETTINGS """
 
@@ -114,8 +108,6 @@ set cursorcolumn
 
 syntax enable
 
-"set t_Co=256
-"let g:molokai_original = 1
 set background=dark
 colorscheme molokai