From d87a201074da8c95d7d0c9bef8617546c510dd37 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Fri, 6 Nov 2020 12:15:32 -0500
Subject: [PATCH] delete lsp stuff and change emmet filetype mapping

---
 files/vim/.vim/after/ftplugin/css.vim      |  2 --
 files/vim/.vim/after/ftplugin/go.vim       |  1 -
 files/vim/.vim/after/ftplugin/html.vim     |  3 ---
 files/vim/.vim/after/ftplugin/markdown.vim |  1 -
 files/vim/.vim/after/ftplugin/python.vim   |  1 -
 files/vim/.vim/autocmds.vim                |  8 ++++----
 files/vim/.vim/keybinds.vim                | 17 +----------------
 files/vim/.vim/vimrc                       |  2 +-
 8 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/files/vim/.vim/after/ftplugin/css.vim b/files/vim/.vim/after/ftplugin/css.vim
index 446a2d0..e69de29 100644
--- a/files/vim/.vim/after/ftplugin/css.vim
+++ b/files/vim/.vim/after/ftplugin/css.vim
@@ -1,2 +0,0 @@
-"vim-emmet
-EmmetInstall
diff --git a/files/vim/.vim/after/ftplugin/go.vim b/files/vim/.vim/after/ftplugin/go.vim
index 240eab3..c436fc0 100644
--- a/files/vim/.vim/after/ftplugin/go.vim
+++ b/files/vim/.vim/after/ftplugin/go.vim
@@ -1,5 +1,4 @@
 "settings
-
 set noexpandtab
 let g:go_auto_type_info = 1
 let g:go_imports_autosave = 1
diff --git a/files/vim/.vim/after/ftplugin/html.vim b/files/vim/.vim/after/ftplugin/html.vim
index 7fe683a..f954cc0 100644
--- a/files/vim/.vim/after/ftplugin/html.vim
+++ b/files/vim/.vim/after/ftplugin/html.vim
@@ -1,6 +1,3 @@
 "syntax
 syntax sync fromstart
 set sw=2 sts=2 ts=2
-
-"vim-emmet
-EmmetInstall
diff --git a/files/vim/.vim/after/ftplugin/markdown.vim b/files/vim/.vim/after/ftplugin/markdown.vim
index 6ce7d9c..3850c70 100644
--- a/files/vim/.vim/after/ftplugin/markdown.vim
+++ b/files/vim/.vim/after/ftplugin/markdown.vim
@@ -1,3 +1,2 @@
 "settings
-
 setlocal spell
diff --git a/files/vim/.vim/after/ftplugin/python.vim b/files/vim/.vim/after/ftplugin/python.vim
index 5942669..10951b7 100644
--- a/files/vim/.vim/after/ftplugin/python.vim
+++ b/files/vim/.vim/after/ftplugin/python.vim
@@ -1,3 +1,2 @@
 "keymaps
-
 xnoremap <leader>r <esc>:'<,'>:w !python3<CR>
diff --git a/files/vim/.vim/autocmds.vim b/files/vim/.vim/autocmds.vim
index 441b436..a88714a 100644
--- a/files/vim/.vim/autocmds.vim
+++ b/files/vim/.vim/autocmds.vim
@@ -11,9 +11,9 @@ if has("autocmd")
                     \ <= line("$") | exe "normal! g'\"" | endif
     augroup END
 
-	" augroup lsp_install
-	" 	autocmd!
-	" 	autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled()
-	" augroup END
+    augroup emmet_group
+        autocmd!
+        autocmd FileType html,css EmmetInstall
+    augroup END
 endif
 "}}}
diff --git a/files/vim/.vim/keybinds.vim b/files/vim/.vim/keybinds.vim
index 464e00f..662b51e 100644
--- a/files/vim/.vim/keybinds.vim
+++ b/files/vim/.vim/keybinds.vim
@@ -19,6 +19,7 @@ nnoremap <leader>dt :r !date<CR>
 "rc files
 nnoremap <leader>rc :vsplit $MYVIMRC<CR>
 nnoremap <leader>so :source $MYVIMRC<CR>
+nnoremap <leader>ft :vsplit $HOME/.vim/after/ftplugin/<CR>
 
 "formatting tools
 nnoremap =j :%!python -m json.tool<CR>
@@ -49,20 +50,4 @@ nmap <leader>agd <Plug>(ale_go_to_definition)
 "vim-emmet
 let g:user_emmet_leader_key = ','
 
-"lsp
-function! s:on_lsp_buffer_enabled() abort
-    setlocal omnifunc=lsp#complete
-    setlocal signcolumn=yes
-    if exists('+tagfunc') | setlocal tagfunc=lsp#tagfunc | endif
-    nmap <buffer> gd <plug>(lsp-definition)
-    nmap <buffer> gr <plug>(lsp-references)
-    nmap <buffer> gi <plug>(lsp-implementation)
-    nmap <buffer> gt <plug>(lsp-type-definition)
-    nmap <buffer> rn <plug>(lsp-rename)
-    nmap <buffer> [g <Plug>(lsp-previous-diagnostic)
-    nmap <buffer> ]g <Plug>(lsp-next-diagnostic)
-    nmap <buffer> K <plug>(lsp-hover)
-    nmap <buffer> <leader>lf <plug>(lsp-document-format)
-    nmap <buffer> <leader>lst <plug>(lsp-status)
-endfunction
 "}}}
diff --git a/files/vim/.vim/vimrc b/files/vim/.vim/vimrc
index cfa71c1..b315019 100644
--- a/files/vim/.vim/vimrc
+++ b/files/vim/.vim/vimrc
@@ -4,9 +4,9 @@
 "  \_/ |_|_| |_| |_|_|  \___|"
 
 source ~/.vim/settings.vim
-source ~/.vim/plugins.vim
 source ~/.vim/functions.vim
 source ~/.vim/commands.vim
+source ~/.vim/plugins.vim
 source ~/.vim/keybinds.vim
 source ~/.vim/colorschemes.vim
 source ~/.vim/autocmds.vim