From 13390b754ae2bf7dbb5a7da5cbd55d69ac70e823 Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <anthony@anthonycicchetti.com>
Date: Mon, 6 Jul 2020 20:09:00 -0400
Subject: [PATCH] Many modifications

---
 vim/vimrc | 97 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 72 insertions(+), 25 deletions(-)

diff --git a/vim/vimrc b/vim/vimrc
index 9e26d88..0c82b7b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -27,8 +27,15 @@ set smartcase
 set splitbelow
 set splitright
 
+if has("nvim-0.5.0")
+    augroup LuaHighlight
+      autocmd!
+      autocmd TextYankPost * silent! lua require'vim.highlight'.on_yank()
+    augroup END
+endif
+
 let g:mapleader="\<SPACE>"
-let g:maplocallead=','
+let g:maplocalleader=','
 
 if has('nvim')
 	set inccommand=split
@@ -47,17 +54,23 @@ call plug#begin('~/.config/nvim/plugged')
 " endif
 Plug 'junegunn/vim-plug'
 
-"LSP Stuff
-Plug 'neoclide/coc.nvim', {'branch': 'release'}
-Plug 'rust-lang/rust.vim'
-Plug 'godlygeek/tabular'
-Plug 'cespare/vim-toml'
-Plug 'stephpy/vim-yaml'
+" Builtin LSP Stuff
+Plug 'neovim/nvim-lsp'
+
+" Lisp-In-Lua
+Plug 'Olical/conjure'
+Plug 'Olical/aniseed'
+Plug 'bakpakin/fennel.vim'
 
 Plug 'terryma/vim-expand-region'
 Plug 'junegunn/rainbow_parentheses.vim'
 
-Plug 'machakann/vim-highlightedyank'
+if !has("nvim-0.5.0")
+    Plug 'machakann/vim-highlightedyank'
+endif
+
+Plug 'nvim-treesitter/nvim-treesitter'
+
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'morhetz/gruvbox'
@@ -75,23 +88,21 @@ Plug 'prabirshrestha/async.vim'
 
 call plug#end()
 
-inoremap <silent><expr> <TAB>
-      \ pumvisible() ? "\<C-n>" :
-      \ <SID>check_back_space() ? "\<TAB>" :
-      \ coc#refresh()
-inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
-inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
-
-function! s:check_back_space() abort
-  let col = col('.') - 1
-  return !col || getline('.')[col - 1]  =~# '\s'
-endfunction
-
-inoremap <silent><expr> <c-space> coc#refresh()
-
-autocmd CursorHold * silent call CocActionAsync('highlight')
-
-command! -nargs=0 Format :call CocAction('format')
+" Builtin LSP
+lua << EOF
+local nvim_lsp = require'nvim_lsp'
+nvim_lsp.ocamlls.setup{}
+nvim_lsp.pyls.setup{
+    settings = {
+        pyls = {
+            configurationSources = { "pyls-black", flake8 }
+        }
+    }
+}
+nvim_lsp.rust_analyzer.setup{}
+nvim_lsp.solargraph.setup{}
+nvim_lsp.yamlls.setup{}
+EOF
 
 set background=dark
 colorscheme corvine
@@ -110,6 +121,8 @@ nnoremap <leader>l <C-W><C-L>
 nnoremap <leader>n :nohl<cr>
 nnoremap <C-k> <C-u>
 nnoremap <C-j> <C-d>
+vnoremap <C-k> <C-u>
+vnoremap <C-j> <C-d>
 
 " Read and write to system clipboard
 vnoremap <Leader>y "+y
@@ -160,3 +173,37 @@ function! GetGitUrl()
 endfunction
 
 nnoremap <silent> <leader>c :call GetGitUrl()<CR>
+
+if has("nvim-0.5.0")
+    lua << EOF
+require 'nvim-treesitter.configs'.setup {
+    highlight = {
+        enable = true,                    -- false will disable the whole extension
+    },
+    incremental_selection = {
+        enable = true,
+        keymaps = {                       -- mappings for incremental selection (visual mappings)
+          init_selection = '<Leader>s',         -- maps in normal mode to init the node/scope selection
+          node_incremental = "u",       -- increment to the upper named parent
+          scope_incremental = "s",      -- increment to the upper scope (as defined in locals.scm)
+          node_decremental = "d",       -- decrement to the previous node
+        }
+    },
+    refactor = {
+      highlight_definitions = {
+        enable = true
+      },
+      smart_rename = {
+        enable = true,
+        smart_rename = "<Leader>r",              -- mapping to rename reference under cursor
+      },
+      navigation = {
+        enable = true,
+        goto_definition = "<Leader>tg",          -- mapping to go to definition of symbol under cursor
+        list_definitions = "<Leader>ta"          -- mapping to list all definitions in current file
+      }
+    },
+    ensure_installed = {'python'}
+}
+EOF
+endif