dave/nix-config
1
0
Fork 0
mirror of https://github.com/davegallant/nix-config synced 2025-08-07 00:58:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup completion

Browse Source
This commit is contained in:
Dave Gallant
2022-04-30 14:43:56 -04:00
parent fe56aca9a1
commit 1a47ccf992
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/packages.nix
View File

@@ -115,7 +115,7 @@ in
restic restic
# infra tools # infra tools
terraform-ls /* terraform-ls */
terraformer terraformer
tflint tflint
tfsec tfsec

20
home/nvim/lua/init.lua
View File

@@ -117,7 +117,7 @@ require("packer").startup(function()
end) end)
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- lsp {{{1 ------------------------------------------------------------------- -- completion {{{1 -------------------------------------------------------------------
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
local has_words_before = function() local has_words_before = function()
@@ -134,8 +134,7 @@ cmp.setup {
{ name = 'path' }, { name = 'path' },
{ name = 'treesitter' }, { name = 'treesitter' },
}, },
mapping = { mapping = {
["<Tab>"] = cmp.mapping(function(fallback) ["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
@@ -157,10 +156,13 @@ cmp.setup {
fallback() fallback()
end end
end, { "i", "s" }), end, { "i", "s" }),
}
},
} }
-------------------------------------------------------------------------------
-- lsp {{{1 -------------------------------------------------------------------
-------------------------------------------------------------------------------
local lspconfig = require "lspconfig" local lspconfig = require "lspconfig"
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
@@ -207,6 +209,7 @@ lspconfig.solargraph.setup({
}) })
lspconfig.terraformls.setup({ lspconfig.terraformls.setup({
filetypes={"terraform","tf","hcl"},
capabilities = capabilities, capabilities = capabilities,
}) })
@@ -218,13 +221,6 @@ lspconfig.yamlls.setup({
capabilities = capabilities, capabilities = capabilities,
}) })
vim.cmd([[autocmd BufWritePre *.tf lua vim.lsp.buf.formatting_sync()]])
vim.cmd([[autocmd BufWritePre *.py lua vim.lsp.buf.formatting_sync()]])
vim.cmd([[autocmd BufWritePre *.go lua vim.lsp.buf.formatting_sync()]])
vim.cmd([[autocmd BufWritePre *.rb lua vim.lsp.buf.formatting_sync()]])
vim.cmd([[autocmd BufWritePre *.nix lua vim.lsp.buf.formatting_sync()]])
require'luasnip'.filetype_extend("go", {"go"}) require'luasnip'.filetype_extend("go", {"go"})
require'luasnip'.filetype_extend("ruby", {"rails"}) require'luasnip'.filetype_extend("ruby", {"rails"})