summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorAkshay <[email protected]>2021-02-17 11:54:27 +0000
committerAkshay <[email protected]>2021-02-17 11:54:27 +0000
commit3da566d1c3785ff1fc1911dc4127c8463b08ff90 (patch)
tree81f870a0c1d79fb641bd65e297587cf657a1d081 /lua
parentfcaf13a267b7bacd26ad8b2e952a793645e42bba (diff)
fix indents, scheme ftplugin
Diffstat (limited to 'lua')
-rw-r--r--lua/lsp.lua48
-rw-r--r--lua/treesitter.lua2
2 files changed, 25 insertions, 25 deletions
diff --git a/lua/lsp.lua b/lua/lsp.lua
index f921c70..bc33afd 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -1,36 +1,36 @@
1local nvim_lsp = require('lspconfig') 1local nvim_lsp = require('lspconfig')
2local on_attach = function(client, bufnr) 2local on_attach = function(client, bufnr)
3 local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end 3 local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
4 local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end 4 local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
5 5
6 buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') 6 buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
7 7
8 -- Mappings. 8 -- Mappings.
9 local opts = { noremap=true, silent=true } 9 local opts = { noremap=true, silent=true }
10 buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts) 10 buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
11 buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts) 11 buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
12 buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts) 12 buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
13 buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts) 13 buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
14 buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts) 14 buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
15 buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts) 15 buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
16 buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) 16 buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
17 buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts) 17 buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
18 buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts) 18 buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
19 buf_set_keymap('n', '[g', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts) 19 buf_set_keymap('n', '[g', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
20 buf_set_keymap('n', ']g', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts) 20 buf_set_keymap('n', ']g', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
21 buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts) 21 buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
22 22
23 -- Set some keybinds conditional on server capabilities 23 -- Set some keybinds conditional on server capabilities
24 if client.resolved_capabilities.document_formatting then 24 if client.resolved_capabilities.document_formatting then
25 buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts) 25 buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
26 elseif client.resolved_capabilities.document_range_formatting then 26 elseif client.resolved_capabilities.document_range_formatting then
27 buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts) 27 buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
28 end 28 end
29end 29end
30 30
31local servers = { "hls", "rnix", "bashls", "pyls" } 31local servers = { "hls", "rnix", "bashls", "pyls" }
32for _, lsp in ipairs(servers) do 32for _, lsp in ipairs(servers) do
33 nvim_lsp[lsp].setup { on_attach = on_attach } 33 nvim_lsp[lsp].setup { on_attach = on_attach }
34end 34end
35 35
36local capabilities = vim.lsp.protocol.make_client_capabilities() 36local capabilities = vim.lsp.protocol.make_client_capabilities()
diff --git a/lua/treesitter.lua b/lua/treesitter.lua
index d503b46..5027de5 100644
--- a/lua/treesitter.lua
+++ b/lua/treesitter.lua
@@ -1,7 +1,7 @@
1require'nvim-treesitter.configs'.setup { 1require'nvim-treesitter.configs'.setup {
2 highlight = { 2 highlight = {
3 enable = true, 3 enable = true,
4 4 -- disable = { "c"},
5 }, 5 },
6 incremental_selection = { 6 incremental_selection = {
7 enable = true, 7 enable = true,