Merge branch 'master' of github.com:ChristianChiarulli/nvcode

3 files changed, 7 insertions, 2 deletions

diff --git a/init.lua b/init.lua
index dc4831b3..42418b08 100644
--- a/init.lua
+++ b/init.lua
@@ -58,6 +58,7 @@ require('lsp.python-ls')
 require('lsp.rust-ls')
 require('lsp.json-ls')
 require('lsp.yaml-ls')
+require('lsp.terraform-ls')
 require('lsp.vim-ls')
 require('lsp.graphql-ls')
 require('lsp.css-ls')
diff --git a/lua/lsp/terraform-ls.lua b/lua/lsp/terraform-ls.lua
new file mode 100644
index 00000000..e90d6e71
--- /dev/null
+++ b/lua/lsp/terraform-ls.lua
@@ -0,0 +1,4 @@
+require'lspconfig'.terraformls.setup{
+    cmd = {DATA_PATH .. "/lspinstall/terraform/terraform-ls", "serve"},
+    on_attach = require'lsp'.common_on_attach
+}
diff --git a/vimscript/nv-whichkey/init.vim b/vimscript/nv-whichkey/init.vim
index 3898aa14..cd5f255f 100644
--- a/vimscript/nv-whichkey/init.vim
+++ b/vimscript/nv-whichkey/init.vim
@@ -30,7 +30,7 @@ let g:which_key_map['e'] = [ ':NvimTreeToggle'                                 ,
 let g:which_key_map['f'] = [ ':Telescope find_files'                           , 'find files' ]
 let g:which_key_map['h'] = [ '<C-W>s'                                          , 'split below']
 let g:which_key_map['M'] = [ ':MarkdownPreviewToggle'                          , 'markdown preview']
-let g:which_key_map['h'] = [ ':let @/ = ""'                                    , 'no highlight' ]
+let g:which_key_map['H'] = [ ':let @/ = ""'                                    , 'no highlight' ]
 let g:which_key_map['r'] = [ ':RnvimrToggle'                                   , 'ranger' ]
 let g:which_key_map['*'] = [ ':DogeGenerate'                                   , 'documentation generator' ]
 let g:which_key_map['u'] = [ ':UndotreeToggle'                                 , 'undo tree' ]
@@ -129,7 +129,7 @@ let g:which_key_map.F = {
 " m is for mark
 " I'd rather use regular marks but they never clear
 let g:which_key_map.m = {
-    \ 'name': '+fold',
+\ 'name': '+mark',
     \ 't' : [':BookmarkToggle'   , 'toggle'],
     \ 'j' : [':BookmarkNext'   , 'next mark'],
     \ 'k' : [':BookmarkPrev'   , 'prev mark']