pitbuster/neovim-config
1
0
Fork 0
Code Activity

formatter+lsp: remove stylua and fix LSP lazy loading

Browse source
This commit is contained in:
Felipe 2023-09-27 00:12:43 -03:00
parent d0982d215a
commit b5836d05f7
Signed by: pitbuster
SSH key fingerprint: SHA256:HDYu2Pm4/TmSX8GBwV49UvFWr1Ljg8XlHxKeCpjJpOk
1 changed files with 55 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
init.lua
View file

@ -43,63 +43,63 @@ vim.opt.listchars = {
trail = "•",
}
---- lualine.nvim ----
local lualine = require('lualine')
local theme = require('lualine.themes.gruvbox')
local lualine = require("lualine")
local theme = require("lualine.themes.gruvbox")
theme.terminal = theme.insert
lualine.setup({
options = {
component_separators = { left = '│', right = '│' },
section_separators = { left = '', right = '' },
component_separators = { left = "│", right = "│" },
section_separators = { left = "", right = "" },
theme = theme,
},
sections = {
lualine_a = { 'mode' },
lualine_b = { 'diagnostics' },
lualine_a = { "mode" },
lualine_b = { "diagnostics" },
lualine_c = {
{
'filename',
"filename",
path = 1,
},
},
lualine_x = {
{
'fileformat',
"fileformat",
cond = function()
return vim.bo.fileformat ~= 'unix'
return vim.bo.fileformat ~= "unix"
end,
},
{
'encoding',
"encoding",
cond = function()
return vim.bo.fileencoding ~= 'utf-8'
return vim.bo.fileencoding ~= "utf-8"
end,
},
},
lualine_y = {
{
'filetype',
"filetype",
icons_enabled = false,
symbols = {
modified = '',
readonly = '',
unnamed = '',
new = '󰎔',
modified = "",
readonly = "",
unnamed = "",
new = "󰎔",
},
}
},
lualine_z = { 'searchcount', 'progress', 'location' },
},
lualine_z = { "searchcount", "progress", "location" },
},
tabline = {
lualine_a = {
{
'buffers',
"buffers",
show_filename_only = false,
max_length = function()
return math.max(math.ceil(vim.o.columns * 2 / 3), vim.o.columns - 6)
end
end,
},
},
lualine_z = { 'tabs' },
lualine_z = { "tabs" },
},
})
@ -199,18 +199,15 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
---- formatter.nvim ----
require("formatter").setup({
filetype = {
lua = {
require("formatter.filetypes.lua").stylua,
},
terraform = {
require("formatter.filetypes.terraform").terraformfmt,
}
},
},
["*"] = {
-- "formatter.filetypes.any" defines default configurations for any
-- filetype
require("formatter.filetypes.any").remove_trailing_whitespace
}
require("formatter.filetypes.any").remove_trailing_whitespace,
},
})
---- LuaSnip
@ -348,7 +345,7 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
tsserver = {},
}
local capabilities = require('cmp_nvim_lsp').default_capabilities()
local capabilities = require("cmp_nvim_lsp").default_capabilities()
lsp.util.default_config = vim.tbl_deep_extend("force", lsp.util.default_config, { capabilities = capabilities })
for server, add_to_config in pairs(servers) do
local config = {
@ -362,6 +359,7 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
end
lsp[server].setup(config)
end
vim.cmd("LspStart")
---- lsp_lines
require("lsp_lines").setup()
@ -369,7 +367,7 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
vim.diagnostic.config({
virtual_text = false,
})
end
end,
})
-- Auto format on save
@ -482,8 +480,8 @@ local gitblame = require("gitblame")
gitblame.setup({
enabled = false,
})
vim.keymap.set({ 'n' }, '<leader>bo', gitblame.open_commit_url)
vim.keymap.set({ 'n' }, '<leader>bt', ":GitBlameToggle<CR>")
vim.keymap.set({ "n" }, "<leader>bo", gitblame.open_commit_url)
vim.keymap.set({ "n" }, "<leader>bt", ":GitBlameToggle<CR>")
---- gitsigns.nvim
require("gitsigns").setup({
on_attach = function(_bufnr)
@ -576,9 +574,9 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
require("nvim-web-devicons").setup()
---- nvim-osc52
vim.keymap.set('n', '<leader>y', require('osc52').copy_operator, { expr = true })
vim.keymap.set('n', '<leader>yy', '<leader>y_', { remap = true })
vim.keymap.set('v', '<leader>y', require('osc52').copy_visual)
vim.keymap.set("n", "<leader>y", require("osc52").copy_operator, { expr = true })
vim.keymap.set("n", "<leader>yy", "<leader>y_", { remap = true })
vim.keymap.set("v", "<leader>y", require("osc52").copy_visual)
---- crates
vim.g.crates_loaded = false
@ -591,15 +589,15 @@ vim.api.nvim_create_autocmd({ "BufEnter" }, {
vim.g.crates_loaded = true
vim.cmd("packadd crates.nvim")
local crates = require('crates')
local crates = require("crates")
crates.setup()
vim.keymap.set('n', '<leader>cv', crates.show_versions_popup)
vim.keymap.set('n', '<leader>cf', crates.show_features_popup)
vim.keymap.set('n', '<leader>cd', crates.show_dependencies_popup)
vim.keymap.set('n', '<leader>cu', crates.update_crate)
vim.keymap.set('v', '<leader>cu', crates.update_crates)
vim.keymap.set('n', '<leader>ca', crates.update_all_crates)
vim.keymap.set('n', '<leader>cD', crates.open_documentation)
vim.keymap.set("n", "<leader>cv", crates.show_versions_popup)
vim.keymap.set("n", "<leader>cf", crates.show_features_popup)
vim.keymap.set("n", "<leader>cd", crates.show_dependencies_popup)
vim.keymap.set("n", "<leader>cu", crates.update_crate)
vim.keymap.set("v", "<leader>cu", crates.update_crates)
vim.keymap.set("n", "<leader>ca", crates.update_all_crates)
vim.keymap.set("n", "<leader>cD", crates.open_documentation)
end,
})
@ -618,14 +616,22 @@ vim.api.nvim_create_autocmd({ "FileType" }, {
local neotest = require("neotest")
neotest.setup({
adapters = {
require("neotest-rust")
}
require("neotest-rust"),
},
})
vim.keymap.set('n', '<leader>tr', function() neotest.run.run() end)
vim.keymap.set('n', '<leader>tf', function() neotest.run.run(vim.fn.expand("%")) end)
vim.keymap.set('n', '<leader>ts', function() neotest.run.stop() end)
vim.keymap.set('n', '<leader>tt', function() neotest.summary.toggle() end)
end
vim.keymap.set("n", "<leader>tr", function()
neotest.run.run()
end)
vim.keymap.set("n", "<leader>tf", function()
neotest.run.run(vim.fn.expand("%"))
end)
vim.keymap.set("n", "<leader>ts", function()
neotest.run.stop()
end)
vim.keymap.set("n", "<leader>tt", function()
neotest.summary.toggle()
end)
end,
})
---- nvim-surround