nvim: run a formatted and update autocmds to new 0.7 api

This commit is contained in:
mequidis
2022-05-12 08:30:50 +03:00
parent bed9511897
commit dbb104cf21
21 changed files with 402 additions and 333 deletions

View File

@ -1,6 +1,6 @@
-- autopairs
require('nvim-autopairs').setup{}
require("nvim-autopairs").setup({})
-- insert () after selecting functions
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
local cmp = require('cmp')
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } }))
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
local cmp = require("cmp")
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))

View File

@ -1,6 +1,6 @@
vim.opt.completeopt = { 'menuone', 'noselect' }
vim.opt.completeopt = { "menuone", "noselect" }
local cmp = require'cmp'
local cmp = require("cmp")
cmp.setup({
snippet = {
@ -11,19 +11,19 @@ cmp.setup({
mapping = {
-- ['<C-n>'] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
-- ['<C-p>'] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
['<C-n>'] = cmp.mapping.select_next_item(),
['<C-p>'] = cmp.mapping.select_prev_item(),
['<C-Space>'] = cmp.mapping.complete(),
['<C-e>'] = cmp.mapping.close(),
['<CR>'] = cmp.mapping.confirm({
["<C-n>"] = cmp.mapping.select_next_item(),
["<C-p>"] = cmp.mapping.select_prev_item(),
["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.close(),
["<CR>"] = cmp.mapping.confirm({
behavior = cmp.ConfirmBehavior.Replace,
select = false
})
select = false,
}),
},
sources = {
{ name = 'path' },
{ name = 'nvim_lsp' },
{ name = 'buffer' },
{ name = 'vsnip' }
}
{ name = "path" },
{ name = "nvim_lsp" },
{ name = "buffer" },
{ name = "vsnip" },
},
})

View File

@ -1 +1 @@
require ('dap-go').setup()
require("dap-go").setup()

View File

@ -1 +1 @@
require'nvim-dap-virtual-text'.setup()
require("nvim-dap-virtual-text").setup()

View File

@ -1,32 +1,32 @@
local dap = require('dap')
local dap = require("dap")
--
-- python
--
dap.adapters.python = {
type = 'executable';
command = 'python';
args = { '-m', 'debugpy.adapter' };
type = "executable",
command = "python",
args = { "-m", "debugpy.adapter" },
}
dap.configurations.python = {
{
type = 'python';
request = 'launch';
name = "Launch file";
type = "python",
request = "launch",
name = "Launch file",
program = "${file}";
program = "${file}",
pythonPath = function()
local cwd = vim.fn.getcwd()
if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then
return cwd .. '/venv/bin/python'
elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then
return cwd .. '/.venv/bin/python'
if vim.fn.executable(cwd .. "/venv/bin/python") == 1 then
return cwd .. "/venv/bin/python"
elseif vim.fn.executable(cwd .. "/.venv/bin/python") == 1 then
return cwd .. "/.venv/bin/python"
else
return '/usr/bin/python'
return "/usr/bin/python"
end
end;
end,
},
}
@ -35,9 +35,9 @@ dap.configurations.python = {
--
dap.adapters.lldb = {
type = 'executable',
command = '/usr/bin/lldb-vscode',
name = "lldb"
type = "executable",
command = "/usr/bin/lldb-vscode",
name = "lldb",
}
dap.configurations.c = {
@ -46,9 +46,9 @@ dap.configurations.c = {
type = "lldb",
request = "launch",
program = function()
return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
end,
cwd = '${workspaceFolder}',
cwd = "${workspaceFolder}",
stopOnEntry = false,
args = {},

View File

@ -1,5 +1,5 @@
require('lint').linters_by_ft = {
python = {'mypy'}
}
require("lint").linters_by_ft = {
python = { "mypy" },
}
vim.cmd("au BufWrite <buffer> lua require('lint').try_lint()")

View File

@ -1,16 +1,16 @@
local lsp = require('lspconfig')
local lsp = require("lspconfig")
-- language servers
lsp.pyright.setup{
lsp.pyright.setup({
settings = {
python = {
analysis = {
typeCheckingMode = "off"
}
}
}
}
lsp.gopls.setup{}
lsp.clangd.setup{}
lsp.texlab.setup{}
lsp.rust_analyzer.setup{}
typeCheckingMode = "off",
},
},
},
})
lsp.gopls.setup({})
lsp.clangd.setup({})
lsp.texlab.setup({})
lsp.rust_analyzer.setup({})

View File

@ -1,8 +1,8 @@
cfg = {
hint_prefix = " ",
handler_opts = {
border = "none"
border = "none",
},
}
require "lsp_signature".setup(cfg)
require("lsp_signature").setup(cfg)

View File

@ -1,8 +1,8 @@
-- lualine colorscheme
require('lualine').setup{
options = {
theme = 'auto',
section_separators = {'', ''},
component_separators = {'', ''}
}
}
require("lualine").setup({
options = {
theme = "auto",
section_separators = { "", "" },
component_separators = { "", "" },
},
})

View File

@ -1 +1 @@
vim.g.neoformat_enabled_python = {'yapf'}
vim.g.neoformat_enabled_python = { "yapf" }

View File

@ -1,9 +1,13 @@
-- nvim tree
require'nvim-tree'.setup{
require("nvim-tree").setup({
update_cwd = true,
diagnostics = {
enable = true,
},
}
})
vim.cmd("autocmd BufEnter * ++nested if winnr('$') == 1 && bufname() == 'NvimTree_' . tabpagenr() | quit | endif")
-- close tab/vim when nvim-tree is the last window in the tab
vim.api.nvim_create_autocmd("BufEnter", {
pattern = "*",
command = "if winnr('$') == 1 && bufname() == 'NvimTree_' . tabpagenr() | quit | endif",
})

View File

@ -1,8 +1,8 @@
-- telescope settings
require('telescope').setup{
require("telescope").setup({
defaults = {
-- sorting
file_sorter = require'telescope.sorters'.get_fzy_sorter,
generic_sorter = require'telescope.sorters'.get_fzy_sorter,
}
}
file_sorter = require("telescope.sorters").get_fzy_sorter,
generic_sorter = require("telescope.sorters").get_fzy_sorter,
},
})

View File

@ -1,2 +1,2 @@
vim.o.hidden = true
require("toggleterm").setup{}
require("toggleterm").setup({})

View File

@ -1,5 +1,5 @@
require'nvim-treesitter.configs'.setup {
require("nvim-treesitter.configs").setup({
highlight = {
enable = true,
},
}
})

View File

@ -1,5 +1,5 @@
-- ignore certain errors
vim.g.vimtex_quickfix_ignore_filters = { 'Underfull', 'Overfull', 'babel' }
vim.g.vimtex_quickfix_ignore_filters = { "Underfull", "Overfull", "babel" }
-- use zathura as the pdf viewer
vim.g.vimtex_view_general_viewer = 'zathura'
vim.g.vimtex_view_general_viewer = "zathura"

View File

@ -2,7 +2,7 @@ local wk = require("which-key")
wk.register({
a = {
name = "Actions",
r = "Reload Config"
r = "Reload Config",
},
d = {
name = "Debug",
@ -16,7 +16,7 @@ wk.register({
p = "List Breakpoints",
q = "Stop",
u = "Toggle UI",
v = "Show Variables"
v = "Show Variables",
},
g = {
name = "Language",
@ -30,7 +30,7 @@ wk.register({
n = "Rename",
q = "Show Diagnostics",
r = "Show References",
t = "Show Type Definition"
t = "Show Type Definition",
},
s = {
name = "Splits & Buffers",
@ -68,6 +68,6 @@ wk.register({
l = "Right Split",
q = "Quit",
s = "Save",
x = "Quit Without Saving"
x = "Quit Without Saving",
}, { prefix = "<leader>" })
wk.setup{}
wk.setup({})