From 16b669f1cef5e7e2c30f46f4fa122637676797a5 Mon Sep 17 00:00:00 2001 From: chaeing Date: Sun, 28 Mar 2021 02:19:13 -0700 Subject: Refactor telescope extension config (#176) Desired way to configure extensions is to put it at the same level as 'defaults' property inside the 'setup' call. --- lua/nv-telescope/init.lua | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lua') 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`) } } } -- cgit v1.2.3 From 8ce7e8d800881caef699db7bba47c42a822e087c Mon Sep 17 00:00:00 2001 From: James Walmsley Date: Sun, 28 Mar 2021 10:19:58 +0100 Subject: [LSP] go - Support gopls through LspInstall. (#177) --- lua/lsp/go-ls.lua | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 lua/lsp/go-ls.lua (limited to 'lua') 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 +} -- cgit v1.2.3 From 4f9a07d42880b9ac48db71f76f866022a3f98cb9 Mon Sep 17 00:00:00 2001 From: Benjamin Schmidt Date: Sun, 28 Mar 2021 20:49:56 +0200 Subject: add black python formatter (#182) --- lua/lsp/efm-general-ls.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lua') 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 -- cgit v1.2.3 From b23041f4d9123bf3330236ff11435cff3c942530 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 28 Mar 2021 14:53:00 -0400 Subject: update usage --- lua/nv-globals.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua') 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, -- cgit v1.2.3 From 225175c9e47fa821e855888066aab85641d6b7a5 Mon Sep 17 00:00:00 2001 From: James Walmsley Date: Sun, 28 Mar 2021 20:21:09 +0100 Subject: [LSP] rust - Add support for rust-analyzer via LspInstall. (#178) --- lua/lsp/rust-ls.lua | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 lua/lsp/rust-ls.lua (limited to 'lua') 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 +} + -- cgit v1.2.3 From 94444afe20aa55266b82dd6f54b41aef65d5fd66 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 28 Mar 2021 15:50:28 -0400 Subject: disable treesitter indent for python --- lua/nv-autopairs/init.lua | 5 ++--- lua/nv-treesitter/init.lua | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'lua') 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' , '','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-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 = {}, -- cgit v1.2.3