summaryrefslogtreecommitdiff
path: root/.config/nvim/lua
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/lua')
-rw-r--r--.config/nvim/lua/getchoo/ftdetect.lua3
-rw-r--r--.config/nvim/lua/getchoo/lsp/config/null_ls.lua24
2 files changed, 12 insertions, 15 deletions
diff --git a/.config/nvim/lua/getchoo/ftdetect.lua b/.config/nvim/lua/getchoo/ftdetect.lua
index 1386cf2..f5a15cb 100644
--- a/.config/nvim/lua/getchoo/ftdetect.lua
+++ b/.config/nvim/lua/getchoo/ftdetect.lua
@@ -1,8 +1,5 @@
-- load custom file types
-vim.g.do_filetype_lua = 1 -- enable filetype.lua
-vim.g.did_load_filetypes = 0
-
local filetypes = {
filename = {
PKGBUILD = "text",
diff --git a/.config/nvim/lua/getchoo/lsp/config/null_ls.lua b/.config/nvim/lua/getchoo/lsp/config/null_ls.lua
index dd091a9..5fded8d 100644
--- a/.config/nvim/lua/getchoo/lsp/config/null_ls.lua
+++ b/.config/nvim/lua/getchoo/lsp/config/null_ls.lua
@@ -4,15 +4,15 @@ local M = {}
-- only use null-ls for formatting
---- for neovim >= 8
---- local lsp_formatting = function(bufnr)
---- vim.lsp.buf.format({
---- filter = function(client)
---- return client.name == "null-ls"
---- end,
---- bufnr = bufnr,
---- })
---- end
+-- for neovim >= 8
+local lsp_formatting = function(bufnr)
+ vim.lsp.buf.format({
+ filter = function(client)
+ return client.name == "null-ls"
+ end,
+ bufnr = bufnr,
+ })
+end
local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
local formatting_on_attach = function(client, bufnr)
@@ -22,9 +22,9 @@ local formatting_on_attach = function(client, bufnr)
group = augroup,
buffer = bufnr,
callback = function()
- local params = require("vim.lsp.util").make_formatting_params({})
- client.request("textDocument/formatting", params, nil, bufnr)
- -- lsp_formatting(bufnr) -- neovim >= 8
+ -- local params = require("vim.lsp.util").make_formatting_params({})
+ -- client.request("textDocument/formatting", params, nil, bufnr)
+ lsp_formatting(bufnr) -- neovim >= 8
end,
})
end