Merge branch 'master' into babel

coc-settings.json

@@ -1,7 +1,7 @@
 {
 	"languageserver": {
 		"rust": {
-			"command": "/usr/bin/rust-analyzer",
+			"command": "/home/nicolas/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin/rust-analyzer",
 			"filetypes": ["rust"],
 			"rootPatterns": ["Cargo.toml"]
 		},
@@ -9,10 +9,10 @@
 			"command": "/sbin/texlab",
 			"filetypes": [ "tex","bib","plaintex","context" ]
 		},
-		"golang": {
+		"bash": {
-			"command": "gopls",
+			"command": "bash-language-server",
-			"rootPatterns": ["go.mod"],
+			"args": ["start"],
-			"filetypes": ["go"]
+			"filetypes": ["sh","bash"]
 		}
 	}
 }

init.vim

@@ -10,7 +10,6 @@ Plug 'scrooloose/nerdcommenter'
 Plug 'javier-lopez/sprunge.vim'
 Plug 'vim-scripts/Trailer-Trash'
 Plug 'vim-scripts/bad-whitespace'
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'aklt/plantuml-syntax'
 Plug 'vim-scripts/scons.vim'
@@ -18,7 +17,7 @@ Plug 'danro/rename.vim'
 Plug 'ciaranm/detectindent'
 Plug 'jiangmiao/auto-pairs'
 Plug 'antoyo/vim-licenses'
-Plug 'flazz/vim-colorschemes'
+Plug 'lifepillar/vim-solarized8'
 Plug 'xiyaowong/transparent.nvim'
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
 call plug#end()
@@ -30,7 +29,7 @@ filetype plugin on
 " indentation
 set tabstop=4                " tabs only count for 4 spaces
 set shiftwidth=4             " when indenting use 4 spaces
-set noexpandtab              " use tab characters
+set expandtab              " use tab characters
 set autoindent
 
 " view
@@ -48,32 +47,24 @@ set foldmethod=syntax
 "set foldlevel=0
 "set foldnestmax=1
 
-" Scrolloff
-set scrolloff=7
-
 " CoC settings
-function! CheckBackspace() abort
-	let col = col('.') - 1
-	return !col || getline('.')[col - 1]  =~# '\s'
-endfunction
-
 inoremap <silent><expr> <TAB>
       \ coc#pum#visible() ? coc#pum#next(1) :
       \ CheckBackspace() ? "\<Tab>" :
-	  \ coc#expandableOrJumpable() ? "\<C-r>=coc#snippet#next()\<CR>" :
-	  \ coc#refresh()
-inoremap <silent><expr> <S-TAB>
-	  \ coc#pum#visible() ? coc#pum#prev(1) :
-	  \ CheckBackspace() ? "\<S-Tab>" :
-	  \ coc#expandableOrJumpable() ? "\<C-r>=coc#snippet#prev()\<CR>" :
       \ coc#refresh()
+inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
+"inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+"inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+nmap <C-a> :CocAction<CR>
 let g:coc_disable_startup_warning = 1
 
 inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
                               \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
 
-let g:coc_snippet_next = '<Tab>'
+function! CheckBackspace() abort
-let g:coc_snippet_prev = '<S-Tab>'
+	let col = col('.') - 1
+	return !col || getline('.')[col - 1]  =~# '\s'
+endfunction
 
 func! s:my_colors_setup() abort
 	" this is an example
@@ -90,20 +81,11 @@ nmap <silent> [g <Plug>(coc-diagnostic-prev)
 nmap <silent> ]g <Plug>(coc-diagnostic-next)
 nmap <silent> ]f <Plug>(coc-fix-current)
 
-" Symbol renaming
-nmap <leader>rn <Plug>(coc-rename)
-
-" GoTo code navigation
-nmap <silent><nowait> gd <Plug>(coc-definition)
-nmap <silent><nowait> gy <Plug>(coc-type-definition)
-nmap <silent><nowait> gi <Plug>(coc-implementation)
-nmap <silent><nowait> gr <Plug>(coc-references)
-
 " syntax highlighting
 syntax on
 set background=dark
+colorscheme solarized8
 highlight Normal ctermbg=none
-colorscheme solarized8_dark
 
 """ Project-Specific Settings
 
@@ -133,7 +115,7 @@ let g:rust_recommended_style = 0   " disable retarded option
 """ plugin settings
 " airline
 let g:airline#extensions#tabline#enabled = 1   " enable tabline
-let g:airline_theme='solarized_flood'
+let g:airline_theme='luna'
 if !exists('g:airline_symbols')
 	let g:airline_symbols = {}
 endif
@@ -156,5 +138,5 @@ let g:licenses_authors_name = 'Nicolás Ortega Froysa <nicolas@ortegas.org>'
 let g:licenses_default_command = [ 'Affero' ]
 
 " FZF
-nnoremap <leader>f :GFiles<CR>
+nnoremap <leader>f :FZF<CR>
-nnoremap <leader>F :tabnew<CR>:GFiles<CR>
+nnoremap <leader>F :tabnew<CR>:FZF<CR>