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

10 files changed, 25 insertions, 17 deletions

diff --git a/init.lua b/init.lua
index 3701b15b..40e6f28f 100644
--- a/init.lua
+++ b/init.lua
@@ -48,8 +48,10 @@ require('lsp')
 require('lsp.clangd')
 require('lsp.lua-ls')
 require('lsp.bash-ls')
+require('lsp.go-ls')
 require('lsp.js-ts-ls')
 require('lsp.python-ls')
+require('lsp.rust-ls')
 require('lsp.json-ls')
 require('lsp.yaml-ls')
 require('lsp.vim-ls')
diff --git a/lua/lsp/efm-general-ls.lua b/lua/lsp/efm-general-ls.lua
index db9ffbcb..39a63c78 100644
--- a/lua/lsp/efm-general-ls.lua
+++ b/lua/lsp/efm-general-ls.lua
@@ -13,6 +13,7 @@ local flake8 = {
 local isort = {formatCommand = "isort --quiet -", formatStdin = true}
 
 local yapf = {formatCommand = "yapf --quiet", formatStdin = true}
+local black = {formatCommand = "black --quiet --stdin-filename ", formatStdin = true}
 
 if O.python.linter == 'flake8' then
 	table.insert(python_arguments, flake8)
@@ -20,6 +21,8 @@ end
 
 if O.python.formatter == 'yapf' then
 	table.insert(python_arguments, yapf)
+elseif O.python.formatter == 'black' then
+    table.insert(python_arguments, black)
 end
 
 if O.python.isort then
diff --git a/lua/lsp/go-ls.lua b/lua/lsp/go-ls.lua
new file mode 100644
index 00000000..d9df138e
--- /dev/null
+++ b/lua/lsp/go-ls.lua
@@ -0,0 +1,4 @@
+require'lspconfig'.gopls.setup{
+    cmd = {DATA_PATH .. "/lspinstall/go/gopls"},
+    on_attach = require'lsp'.common_on_attach
+}
diff --git a/lua/lsp/rust-ls.lua b/lua/lsp/rust-ls.lua
new file mode 100644
index 00000000..377a31e5
--- /dev/null
+++ b/lua/lsp/rust-ls.lua
@@ -0,0 +1,5 @@
+require'lspconfig'.rust_analyzer.setup{
+    cmd = {DATA_PATH .. "/lspinstall/rust/rust-analyzer"},
+    on_attach = require'lsp'.common_on_attach
+}
+
diff --git a/lua/nv-autopairs/init.lua b/lua/nv-autopairs/init.lua
index a8d5c1aa..7fa067be 100644
--- a/lua/nv-autopairs/init.lua
+++ b/lua/nv-autopairs/init.lua
@@ -36,10 +36,9 @@
 --     return npairs.check_break_line_char()
 --   end
 -- end
--- 
--- 
+--
+--
 -- remap('i' , '<CR>','v:lua.MUtils.completion_confirm()', {expr = true , noremap = true})
-
 -- TODO switch to lua plugin when possible
 vim.cmd([[
 let g:lexima_no_default_rules = v:true
diff --git a/lua/nv-globals.lua b/lua/nv-globals.lua
index 873a8994..845eccbd 100644
--- a/lua/nv-globals.lua
+++ b/lua/nv-globals.lua
@@ -4,7 +4,7 @@ O = {
     colorscheme = 'nvcode',
     python = {
         linter = '',
-        -- @usage can be 'yapf'
+        -- @usage can be 'yapf', 'black'
         formatter = '',
         autoformat = false,
         isort = false,
diff --git a/lua/nv-telescope/init.lua b/lua/nv-telescope/init.lua
index bcb2de67..0730f791 100644
--- a/lua/nv-telescope/init.lua
+++ b/lua/nv-telescope/init.lua
@@ -62,14 +62,12 @@ require('telescope').setup {
             }
         }
     },
-    require'telescope'.setup {
-        extensions = {
-            media_files = {
-                -- filetypes whitelist
-                -- defaults to {"png", "jpg", "mp4", "webm", "pdf"}
-                filetypes = {"png", "webp", "jpg", "jpeg"},
-                find_cmd = "rg" -- find command (defaults to `fd`)
-            }
+    extensions = {
+        media_files = {
+            -- filetypes whitelist
+            -- defaults to {"png", "jpg", "mp4", "webm", "pdf"}
+            filetypes = {"png", "webp", "jpg", "jpeg"},
+            find_cmd = "rg" -- find command (defaults to `fd`)
         }
     }
 }
diff --git a/lua/nv-treesitter/init.lua b/lua/nv-treesitter/init.lua
index 372b6054..0d08d04d 100644
--- a/lua/nv-treesitter/init.lua
+++ b/lua/nv-treesitter/init.lua
@@ -5,7 +5,7 @@ require'nvim-treesitter.configs'.setup {
     highlight = {
         enable = true -- false will disable the whole extension
     },
-    indent = {enable = true},
+    indent = {enable = true, disable = {"python"}},
     playground = {
         enable = true,
         disable = {},
diff --git a/test.py b/test.py
deleted file mode 100644
index 6cf32a8b..00000000
--- a/test.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-def thing(parameter_list):
-    pass
diff --git a/vimscript/nv-whichkey/init.vim b/vimscript/nv-whichkey/init.vim
index 1557010b..0fcd8a2f 100644
--- a/vimscript/nv-whichkey/init.vim
+++ b/vimscript/nv-whichkey/init.vim
@@ -3,7 +3,7 @@
 " Timeout
 let g:which_key_timeout = 100
 
-let g:which_key_display_names = {'<CR>': '↵', '<TAB>': '⇆'}
+let g:which_key_display_names = {'<CR>': '↵', '<TAB>': '⇆', " ": 'SPC'}
 
 " Map leader to which_key
 nnoremap <silent> <leader> :silent <c-u> :silent WhichKey '<Space>'<CR>