3 files changed, 146 insertions, 21 deletions

diff --git a/dunst/.config/dunst/dunstrc b/dunst/.config/dunst/dunstrc
index 178e4ec..a6941fe 100644
--- a/dunst/.config/dunst/dunstrc
+++ b/dunst/.config/dunst/dunstrc
@@ -19,7 +19,7 @@
     horizontal_padding = 14
 
     # The frame color and width of the notification
-    frame_color = "#5b5b5b"
+    frame_color = "#2f2f2f"
     frame_width = 5
     line_height = 0
 
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 32bf76c..fc61186 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -1,8 +1,6 @@
 " vimplug
 call plug#begin()
-Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-Plug 'Shougo/deoplete-clangx'
-Plug 'deoplete-plugins/deoplete-jedi'
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'Shougo/deol.nvim'
 Plug 'ap/vim-css-color'
 Plug 'tpope/vim-eunuch'
@@ -38,22 +36,44 @@ colorscheme pencil
 "hi Normal ctermbg=16 guibg=#000000
 "hi LineNr ctermbg=16 guibg=#000000
 
+let mapleader=" "
+
+" Alias write and quit to Q
+nnoremap <leader>q :wq<CR>
+nnoremap <leader>w :w<CR>
+
+" Save file as sudo when no sudo permissions
+cmap w!! w !sudo tee > /dev/null %
+
 " vim-bujo
 nmap <C-N> <Plug>BujoAddnormal
 imap <C-N> <Plug>BujoAddinsert
 nmap <C-P> <Plug>BujoChecknormal
 imap <C-P> <Plug>BujoCheckinsert
 
-" deoplete
-let g:deoplete#enable_at_startup = 1
+" nerdtree
+let g:NERDTreeWinPos = "right"
+map <C-i> :NERDTreeToggle<CR>
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
+
+" system clipboard
+set clipboard+=unnamedplus
+
+" Fix indenting visual block
+vmap < <gv
+vmap > >gv
 
 " git gutter settings
-let g:gitgutter_override_sign_column_highlight = 0
-let g:gitgutter_sign_added                     = '+'
-let g:gitgutter_sign_modified                  = '±'
-let g:gitgutter_sign_removed                   = '-'
-let g:gitgutter_sign_removed_first_line        = '^'
-let g:gitgutter_sign_modified_removed          = '#'
+highlight GitGutterAdd guifg=#009900 ctermfg=Green
+highlight GitGutterChange guifg=#bbbb00 ctermfg=Yellow
+highlight GitGutterDelete guifg=#ff2222 ctermfg=Red
+nmap ) <Plug>(GitGutterNextHunk)
+nmap ( <Plug>(GitGutterPrevHunk)
+let g:gitgutter_enabled = 1
+let g:gitgutter_map_keys = 0
+let g:gitgutter_highlight_linenrs = 1
 
 " vim-markdown 
 let g:vim_markdown_no_default_key_mappings=1
@@ -62,13 +82,6 @@ let g:vim_markdown_yaml_frontmatter=1
 let g:vim_markdown_folding_disabled=1
 let g:vim_markdown_conceal=0
 
-" nerdtree
-let g:NERDTreeWinPos = "right"
-map <C-i> :NERDTreeToggle<CR>
-autocmd StdinReadPre * let s:std_in=1
-autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
-autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
-
 " insert centered
 autocmd InsertEnter * norm zz
 
@@ -129,3 +142,114 @@ set statusline+=%#PrimaryBlock#
 set statusline+=\ %Y\ 
 set statusline+=%#SecondaryBlock#
 set statusline+=\ %P\ 
+
+" ------COC SETTINGS------
+" prettier command for coc
+command! -nargs=0 Prettier :CocCommand prettier.formatFile
+let g:coc_global_extensions = [
+  \ 'coc-snippets',
+  \ 'coc-pairs',
+  \ 'coc-prettier',
+  \ 'coc-tsserver',
+  \ 'coc-html',
+  \ 'coc-css',
+  \ 'coc-json',
+  \ 'coc-clangd',
+  \ 'coc-python',
+  \ 'coc-vimtex'
+  \ ]
+
+" From Coc Readme
+set updatetime=300
+
+" Some servers have issues with backup files, see #649
+set nobackup
+set nowritebackup
+
+" don't give |ins-completion-menu| messages.
+set shortmess+=c
+
+" always show signcolumns
+set signcolumn=yes
+
+" Use tab for trigger completion with characters ahead and navigate.
+" Use command ':verbose imap <tab>' to make sure tab is not mapped by other plugin.
+inoremap <silent><expr> <TAB>
+      \ pumvisible() ? "\<C-n>" :
+      \ <SID>check_back_space() ? "\<TAB>" :
+      \ coc#refresh()
+inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
+
+function! s:check_back_space() abort
+  let col = col('.') - 1
+  return !col || getline('.')[col - 1]  =~# '\s'
+endfunction
+
+" Use <c-space> to trigger completion.
+inoremap <silent><expr> <c-space> coc#refresh()
+
+" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current position.
+" Coc only does snippet and additional edit on confirm.
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+" Or use `complete_info` if your vim support it, like:
+" inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>"
+
+" Use `[g` and `]g` to navigate diagnostics
+nmap <silent> [g <Plug>(coc-diagnostic-prev)
+nmap <silent> ]g <Plug>(coc-diagnostic-next)
+
+" Remap keys for gotos
+nmap <silent> gd <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
+
+function! s:show_documentation()
+  if (index(['vim','help'], &filetype) >= 0)
+    execute 'h '.expand('<cword>')
+  else
+    call CocAction('doHover')
+  endif
+endfunction
+
+" Remap for rename current word
+nmap <rn> <Plug>(coc-rename)
+
+" Remap for format selected region
+xmap <leader>f  <Plug>(coc-format-selected)
+nmap <leader>f  <Plug>(coc-format-selected)
+
+augroup mygroup
+  autocmd!
+  " Setup formatexpr specified filetype(s).
+  autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
+  " Update signature help on jump placeholder
+  autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
+augroup end
+
+" Remap for do codeAction of selected region, ex: `<leader>aap` for current paragraph
+xmap <leader>a  <Plug>(coc-codeaction-selected)
+nmap <leader>a  <Plug>(coc-codeaction-selected)
+
+" Remap for do codeAction of current line
+nmap <leader>ac  <Plug>(coc-codeaction)
+" Fix autofix problem of current line
+nmap <leader>qf  <Plug>(coc-fix-current)
+
+" Create mappings for function text object, requires document symbols feature of languageserver.
+xmap if <Plug>(coc-funcobj-i)
+xmap af <Plug>(coc-funcobj-a)
+omap if <Plug>(coc-funcobj-i)
+omap af <Plug>(coc-funcobj-a)
+
+" Use `:Format` to format current buffer
+command! -nargs=0 Format :call CocAction('format')
+
+" Use `:Fold` to fold current buffer
+command! -nargs=? Fold :call     CocAction('fold', <f-args>)
+
+" use `:OR` for organize import of current buffer
+command! -nargs=0 OR   :call     CocAction('runCommand', 'editor.action.organizeImport')
+
+" Add status line support, for integration with other plugin, checkout `:h coc-status`
+set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
diff --git a/spectrwm/.config/spectrwm/spectrwm.conf b/spectrwm/.config/spectrwm/spectrwm.conf
index 204bab1..716b762 100644
--- a/spectrwm/.config/spectrwm/spectrwm.conf
+++ b/spectrwm/.config/spectrwm/spectrwm.conf
@@ -71,11 +71,12 @@ autorun			= ws[1]:xsetroot -cursor_name left_ptr
 autorun                 = ws[1]:xss-lock -- slock
 autorun                 = ws[1]:xset b off
 autorun                 = ws[1]:xset s 300
+autorun                 = ws[1]:xset r rate 300 50
 autorun                 = ws[1]:~/.fehbg
 autorun                 = ws[1]:~/.local/bin/bat_check.sh
-autorun                 = ws[1]:picom
 autorun                 = ws[1]:urxvtd
 autorun                 = ws[1]:dunst
+autorun                 = ws[1]:picom
 
 # Customize workspace layout at start
 # layout                = ws[1]:4:0:0:0:vertical
@@ -158,7 +159,7 @@ program[screenshot_wind]	= ~/.local/bin/screenshot window	# optional
 # quirk[Gimp:gimp]                      = FLOAT + ANYWHERE
 quirk[Gimp:gimp]                        = WS[5]
 quirk[Chromium:chromium]    = WS[2]
-quirk[Steam:Steam]                      = WS[6]
+quirk[Steam:Steam]                      = WS[6] + FLOAT
 # quirk[XTerm:xterm]                    = XTERM_FONTADJ
 # quirk[xine:Xine Window]                       = FLOAT + ANYWHERE
 # quirk[Xitk:Xitk Combo]                        = FLOAT + ANYWHERE