From e42f384432022379f6061a1e813fbff1c4057f18 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Fri, 4 Sep 2020 23:01:51 -0700
Subject: [PATCH] Add updated settings.

---
 nvim/.config/nvim/init.vim | 40 +++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 9753588..9cbb614 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -6,10 +6,12 @@ Plug 'autozimu/LanguageClient-neovim', {'branch': 'next', 'do': 'bash install.sh
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin' }
 Plug 'junegunn/fzf.vim'
 Plug 'SirVer/ultisnips'
-Plug 'enomsg/vim-haskellConcealPlus'
+Plug 'luochen1990/rainbow'
+" Plug 'enomsg/vim-haskellConcealPlus' " This one isn't always good.
 
 " Languages
-Plug 'https://framagit.org/tyreunom/coquille.git'
+Plug 'whonore/Coqtail'
+Plug 'wlangstroth/vim-racket'
 Plug 'lervag/vimtex'
 Plug 'idris-hackers/idris-vim'
 Plug 'rhysd/vim-crystal'
@@ -33,7 +35,7 @@ set expandtab " Expand tabs into spaces
 set number " Set line numbers
 set mouse=a " Allow mouse
 set signcolumn=yes " Always show extra column
-set guifont=Iosevka
+set guifont=Iosevka " Use Ioeska in frontends.
 
 autocmd BufEnter * call ncm2#enable_for_buffer() " Enable ncm2 for all buffers
 autocmd BufRead,BufNewFile *.v set filetype=coq " Coq is not Verilog
@@ -41,6 +43,13 @@ autocmd FileType crystal setlocal shiftwidth=2 " Crystal likes 2-wide indent
 
 set completeopt=noinsert,menuone
 
+colorscheme nord
+
+let g:limelight_conceal_ctermfg = 8
+let g:tex_flavor = 'latex'
+
+" Language Client settings
+let g:rainbow_active = 1
 let g:LanguageClient_hasSnippetSupport = 0
 let g:LanguageClient_serverCommands = {
             \ 'haskell': ['ghcide', '--lsp'],
@@ -62,17 +71,22 @@ let g:LanguageClient_rootMarkers = {
             \ 'haskell': ['.git'],
             \ 'elm': ['elm.json'],
             \ }
-
-let g:limelight_conceal_ctermfg = 8
-
-let g:UltiSnipsExpandTrigger="<tab>"
-let g:UltiSnipsJumpForwardTrigger="<c-k>"
-let g:UltiSnipsJumpBackwardTrigger="<c-j>"
-
-colorscheme nord
 nmap M :call LanguageClient#explainErrorAtPoint()<CR>
 nmap K :call LanguageClient_contextMenu()<CR>
 nmap ? :call LanguageClient#textDocument_hover()<CR>
 
-hi default link CheckedByCoq Visual
-hi default link SentToCoq PmenuSel
+" UltiSnips settings
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<c-k>"
+let g:UltiSnipsJumpBackwardTrigger="<c-j>"
+
+" Racket settings
+au BufReadPost *.rkt,*.rktl set filetype=racket
+au filetype racket set lisp
+au filetype racket set autoindent
+
+" Coq Settings
+function! g:CoqtailHighlight()
+    hi def link CoqtailChecked Visual
+    hi def link CoqtailSent PmenuSel
+endfunction