fix merge conflicts

vim/vimrc

@@ -1,21 +1,18 @@
 call plug#begin('~/.vim/plugged')
 
-"Plug 'artur-shaik/vim-javacomplete2'
-"Plug 'apalmer1377/factorus'
-"Plug 'junegunn/fzf.vim'
-"Plug 'dense-analysis/ale'
-
-Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
+Plug 'dense-analysis/ale'
+Plug 'vim-test/vim-test'
+Plug 'tpope/vim-fugitive'
+Plug 'mfussenegger/nvim-dap'
 
 call plug#end()
 
-" javacomplete2
-autocmd FileType java setlocal omnifunc=javacomplete#Complete
-let g:JavaComplete_ClosingBrace = 1
 
 let g:mapleader = " "
+
 let g:netrw_liststyle = 3
 let g:netrw_banner = 0
 let g:netrw_winsize = 25
@@ -31,6 +28,10 @@ set nohlsearch
 set splitbelow splitright
 set visualbell
 set noerrorbells
+set clipboard+=unnamed,unnamedplus
+set ignorecase
+set smartcase
+set showmatch
 
 nnoremap <C-h> <C-w>h
 nnoremap <C-j> <C-w>j
@@ -50,8 +51,8 @@ nnoremap <Leader>n :bn<CR>
 nnoremap <Leader>t :!clear && make test<CR>
 nnoremap <Leader>b :!clear && make package<CR>
 nnoremap <Leader>m :make 
-nnoremap <Leader>v :e ~/.vim/vimrc<CR> 
-nnoremap <Leader>s :source ~/.vim/vimrc<CR> 
+nnoremap <Leader>v :e ~/.config/nvim/init.vim<CR> 
+nnoremap <Leader>s :source ~/.config/nvim/init.vim<CR> 
 nnoremap <Leader>e :Vex<CR>
 nnoremap zz ZZ
 nnoremap zq ZQ
@@ -60,6 +61,9 @@ nnoremap <Leader>j :m .+1<CR>
 nnoremap <Leader>k :m .-2<CR>
 vnoremap <Leader>j :m '>+1<CR>
 vnoremap <Leader>k :m '<-2<CR>
+nnoremap <Leader>h :SidewaysLeft<cr>
+nnoremap <Leader>l :SidewaysRight<cr>
+
 
 " guile
 nnoremap <Leader>gb gg^i#!/usr/bin/guile \<CR>-e main -s<CR>!#<CR><CR>(define (main args)<CR><CR>)<CR><Esc>kk
@@ -69,3 +73,18 @@ autocmd BufReadPost *.doc,*.docx silent %!antiword "%"
 autocmd BufReadPost *.odt,*.odp silent %!odt2txt "%"
 autocmd BufReadPost *.pdf silent %!pdftotext -nopgbrk -layout -q -eol unix "%" - | fmt -w78
 autocmd BufWriteCmd *.pdf set readonly
+
+
+
+let g:ale_linters = {
+\   'java': ['checkstyle', 'javac', 'pmd'],
+\}
+
+
+let g:ale_fixers = {
+\   'java': ['google-java-format'],
+\}
+
+let g:ale_fix_on_save = 1
+
+autocmd BufWritePre *.java :normal! gg=G " reformat java file on save