update portia settings

.config/coc/extensions/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "coc-go": "^0.1.2",
-    "coc-json": "^1.0.17",
-    "coc-python": "^1.1.7",
-    "coc-snippets": "^2.0.10"
+    "coc-go": ">=0.6.2",
+    "coc-json": ">=1.2.5",
+    "coc-python": ">=1.2.9",
+    "coc-snippets": ">=2.1.19"
   }
-}
+}

.gitconfig

@@ -16,10 +16,12 @@
   ours   = "!f() { git checkout --ours $@ && git add $@; }; f"
   theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
   praise = blame
-  blame = "gblame"
+;  blame = "gblame"
   reabsorb = rebase -i --autosquash
   flog = "!f() { git ls-tree -r --full-name HEAD | awk '{print $4}' | xargs -i sh -c 'echo $(git log --oneline {} | wc -l) {}'; }; f"
   fileprimary = "!f() { git blame --line-porcelain $@ | grep \"author \" | cut -d \" \" -f 2- | sort | uniq -c | sort -n | tail -n 1 | sed -e 's/\\s\\+[0-9]\\+ //g'; }; f"
+  newbranch = "!f() { git fetch origin && git checkout origin/master && git checkout -b $@; }; f"
+  nb = newbranch
 
 [diff]  
   renamelimit = 0

.i3/config

@@ -220,5 +220,5 @@ bindsym $mod+Shift+Control+r mode "goremote"
         #position top
         #tray_output primary
 #}
-#exec --no-startup-id xfce4-panel --disable-wm-check
-exec --no-startup-id polybar example
+exec --no-startup-id xfce4-panel --disable-wm-check
+#exec --no-startup-id polybar example

.vim/coc-settings.json

@@ -1,6 +1,8 @@
 {
     "suggest.timeout": 5000,
     "suggest.enablePreview": true,
+		"suggest.enablePreselect": false,
+		"suggest.noselect": true,
     "diagnostic.displayByAle": false,
     "diagnostic.checkCurrentLine": true,
     "python.linting.flake8Enabled": true,

.vim/colors/baraknew.vim

@@ -419,4 +419,6 @@ hi DONE guifg=green guibg=NONE ctermfg=green ctermbg=NONE
 "
 
 hi deniteMatchedChar guifg=#FFFFFF guibg=#5F87FF ctermfg=15 ctermbg=27
-hi link NormalFloat  PmenuSel
+hi link NormalFloat  Pmenu
+
+hi CocErrorSign ctermfg=166 guifg=#d03000

.vimrc

@@ -178,6 +178,10 @@ Plug 'derekwyatt/vim-scala', {'for': 'scala'}
     "\ }
 "Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' }
 Plug 'neoclide/coc.nvim', {'branch': 'release'}
+"Plug 'prabirshrestha/async.vim'
+"Plug 'prabirshrestha/vim-lsp'
+"Plug 'prabirshrestha/asyncomplete.vim'
+"Plug 'prabirshrestha/asyncomplete-lsp.vim'
 
 " Plugins that do specific things
 Plug 'Shougo/vimproc.vim'
@@ -216,6 +220,7 @@ autocmd InsertLeave * if pumvisible() == 0|pclose|endif
 "source ~/.vim/supertab.vim
 "source ~/.vim/charm.vim
 "source ~/.vim/plugin/AppleT.vim
+source ~/.vim/vim-lsp-conf.vim
 runtime macros/matchit.vim
 
 " Completion features (TODO: Add to filetype.vim)
@@ -773,6 +778,7 @@ nnoremap <silent> <Leader>o :CtrlPBuffer<CR>
 "nnoremap <Leader>p  :PTW 
 nnoremap <Leader>p  :LustyJugglePrevious<CR>
 nnoremap <Leader>jd :YcmCompleter GoToDefinitionElseDeclaration<CR>
+nnoremap <Leader>mm :w<CR>:make!<CR>
 
 " ** EXTRA INCLUDES **
 "