update nvim config

This commit is contained in:
ksyasuda
2022-03-08 22:49:34 -08:00
parent 758fc2fe3f
commit 7eafb32215
6 changed files with 66 additions and 62 deletions

View File

@@ -176,7 +176,7 @@ end)
-- Use a loop to conveniently call 'setup' on multiple servers and
-- map buffer local keybindings when the language server attaches
local servers = { 'pyright', 'bashls', 'sqls', 'vimls', 'yamlls', 'dockerls', 'html', 'sumneko_lua', 'jsonls', 'dotls', 'rust_analyzer', 'clangd' }
local servers = { 'pyright', 'bashls', 'vimls', 'yamlls', 'dockerls', 'html', 'sumneko_lua', 'dotls', 'rust_analyzer', 'clangd' }
for _, lsp in pairs(servers) do
require('lspconfig')[lsp].setup {
on_attach = on_attach,

View File

@@ -1,52 +1,53 @@
require('lualine').setup {
options = {
icons_enabled = true,
theme = 'codedark',
-- theme = 'dracula',
-- theme = 'horizon',
-- theme = 'onedark',
component_separators = { left = '', right = ''},
section_separators = { left = '', right = ''},
disabled_filetypes = {},
always_divide_middle = true,
},
sections = {
lualine_a = { 'mode' },
lualine_b = {'branch', 'diff'},
lualine_c = {'filename'},
lualine_x = {
{
'diagnostics',
'fileformat',
symbols = {
unix = '', -- e712
dos = '', -- e70f
mac = '', -- e711
}
}, 'encoding', 'fileformat', {'filetype', colored=true, icon_only=false}},
lualine_y = {'progress'},
lualine_z = {'location'}
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = {
{
'filename',
file_status = true, -- Displays file status (readonly status, modified status)
path = 0, -- 0: Just the filename
shorting_target = 40, -- Shortens path to leave 40 spaces in the window
symbols = {
modified = '[+]', -- Text to show when the file is modified.
readonly = '[-]', -- Text to show when the file is non-modifiable or readonly.
unnamed = '[No Name]', -- Text to show for unnamed buffers.
}
},
},
lualine_x = {'location'},
lualine_y = {},
lualine_z = {}
},
tabline = {},
extensions = {'quickfix', 'fzf', 'nvim-tree', 'symbols-outline', 'fugitive'}
}
require('lualine').setup {
options = {
icons_enabled = true,
theme = 'codedark',
-- theme = 'dracula',
-- theme = 'horizon',
-- theme = 'onedark',
component_separators = { left = '', right = '' },
section_separators = { left = '', right = ''},
-- section_separators = { left = '', right = '' },
disabled_filetypes = {},
always_divide_middle = true,
},
sections = {
lualine_a = { 'mode' },
lualine_b = { 'branch', 'diff' },
lualine_c = { 'filename' },
lualine_x = {
{
'diagnostics',
'fileformat',
symbols = {
unix = '', -- e712
dos = '', -- e70f
mac = '', -- e711
}
}, 'encoding', 'fileformat', { 'filetype', colored = true, icon_only = false } },

View File

@@ -20,7 +20,7 @@ require("null-ls").setup({
require("null-ls").builtins.diagnostics.cppcheck,
require("null-ls").builtins.diagnostics.gitlint,
require("null-ls").builtins.diagnostics.jsonlint,
require("null-ls").builtins.diagnostics.luacheck,
-- require("null-ls").builtins.diagnostics.luacheck,
require("null-ls").builtins.diagnostics.markdownlint,
require("null-ls").builtins.diagnostics.pylint,
require("null-ls").builtins.diagnostics.pydocstyle.with({
@@ -28,13 +28,14 @@ require("null-ls").setup({
}),
require("null-ls").builtins.diagnostics.vint,
require("null-ls").builtins.formatting.json_tool,
require("null-ls").builtins.formatting.lua_format,
-- require("null-ls").builtins.formatting.lua_format,
require("null-ls").builtins.formatting.markdownlint,
require("null-ls").builtins.formatting.prettier,
require("null-ls").builtins.formatting.rustfmt,
-- handled by lsp server
-- require("null-ls").builtins.formatting.rustfmt,
require("null-ls").builtins.formatting.shfmt.with({
filetypes = {"sh", "bash"},
extra_args = { "-i", "4", "-ci", "-sr" }
extra_args = { "-i", "0", "-ci", "-sr" }
}),
require("null-ls").builtins.diagnostics.shellcheck.with({
extra_args = { "-s", "bash", "-o", "check-extra-masked-returns, check-set-e-suppressed, check-unassigned-uppercase, deprecate-which, quote-safe-variables" }

View File

@@ -20,8 +20,8 @@ onedarkpro.setup({
styles = {
comments = "italic",
functions = "bold",
keywords = "bold,italic",
strings = "italic",
keywords = "italic,bold",
strings = "NONE",
variables = "bold"
},
options = {