From 728378eb2ac5daa1aa2597fa8d42b9c87d030e4a Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Sat, 13 Feb 2021 16:50:00 -0800
Subject: [PATCH] add rust and some config updates to vim

---
 .config/coc/extensions/package.json |  3 ++-
 .vim/coc-settings.json              |  2 ++
 .vimrc                              | 13 ++++++++++---
 bin/run_terminal                    |  6 +++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json
index a5d8571..70edf74 100644
--- a/.config/coc/extensions/package.json
+++ b/.config/coc/extensions/package.json
@@ -2,8 +2,9 @@
   "dependencies": {
     "coc-json": ">=1.3.2",
     "coc-pyright": ">=1.1.97",
+    "coc-rust-analyzer": ">=0.32.0",
     "coc-snippets": ">=2.2.3",
-    "coc-svelte": ">=0.1.1",
+    "coc-svelte": "https://github.com/codechips/coc-svelte",
     "coc-tailwindcss": ">=0.7.0",
     "coc-tsserver": ">=1.6.0",
     "coc-ultisnips": ">=1.2.3"
diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json
index 1387bbe..8c6e9a4 100644
--- a/.vim/coc-settings.json
+++ b/.vim/coc-settings.json
@@ -12,6 +12,8 @@
     "python.analysis.typeCheckingMode": "off",
     "suggest.detailField": "abbr",
     "suggest.snippetIndicator": "",
+    "rust-analyzer.server.path": "/bin/rust-analyzer",
+    "rust-analyzer.inlayHints.enable": false,
     "languageserver": {
       "ccls": {
         "command": "ccls",
diff --git a/.vimrc b/.vimrc
index 38f1116..ac49f94 100644
--- a/.vimrc
+++ b/.vimrc
@@ -171,13 +171,17 @@ Plug 'ervandew/supertab'
 Plug 'lunaru/vim-less'
 Plug 'hylang/vim-hy', {'for': 'hy'}
 "Plug 'mhartington/nvim-typescript'
+Plug 'leafgarland/typescript-vim'
 Plug 'leafOfTree/vim-svelte-plugin'
 "Plug 'posva/vim-vue'
 Plug 'Shougo/context_filetype.vim'
-Plug 'idris-hackers/idris-vim', {'for': 'idris'}
+"Plug 'idris-hackers/idris-vim', {'for': 'idris'}
+Plug 'edwinb/idris2-vim', {'for': 'idris'}
+Plug 'fedorenchik/AnsiEsc'
 Plug 'derekwyatt/vim-scala', {'for': 'scala'}
 Plug 'hwayne/tla.vim'
 Plug 'zchee/vim-goasm'
+Plug 'cakebaker/scss-syntax.vim'
 "Plug 'cappyzawa/starlark.vim'
 
 " Plugins that autocomplete
@@ -206,6 +210,7 @@ Plug 'whonore/coquille', {'branch': 'pathogen-bundle', 'for': 'coq'}
 Plug 'gabrielelana/vim-markdown'
 Plug 'lervag/vimtex'
 Plug 'Shougo/echodoc.vim'
+Plug 'python-rope/ropevim'
 
 
 " Unclear
@@ -246,8 +251,9 @@ syntax enable
 " If you prefer the Omni-Completion tip window to close when a selection is
 " made, these lines close it on movement in insert mode or when leaving
 " insert mode
-autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
-autocmd InsertLeave * if pumvisible() == 0|pclose|endif
+"autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
+"autocmd InsertLeave * if pumvisible() == 0|pclose|endif
+inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm() : "\<C-g>u\<CR>"
 
 " Sources
 "source ~/.vim/supertab.vim
@@ -276,6 +282,7 @@ syntax on
 " baraknew is my own colorscheme. I used to use slate or dante.
 "colorscheme baraknew
 "let g:codedark_conservative = 1
+let g:codedark_null_background=1
 colorscheme codedark
 "colorscheme slate
 "colorscheme dante
diff --git a/bin/run_terminal b/bin/run_terminal
index e2840a5..63f8988 100755
--- a/bin/run_terminal
+++ b/bin/run_terminal
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-if [ -n "`which gnome-terminal`" ]; then
+if [ -n "`which terminator`" ]; then
+  terminator $@
+elif [ -n "`which gnome-terminal`" ]; then
   gnome-terminal $@
 elif [ -n "`which xfce4-terminal`" ]; then
   xfce4-terminal $@
-elif [ -n "`which terminator`" ]; then
-  terminator $@
 elif [ -n "`which urxvt`" ]; then
   urxvt $@
 else