nvim: run a formatted and update autocmds to new 0.7 api
This commit is contained in:
@ -1 +1 @@
|
|||||||
vim.cmd 'colorscheme wal'
|
vim.cmd("colorscheme wal")
|
||||||
|
|||||||
@ -16,7 +16,7 @@ local disabled_built_ins = {
|
|||||||
"logipat",
|
"logipat",
|
||||||
"rrhelper",
|
"rrhelper",
|
||||||
"spellfile_plugin",
|
"spellfile_plugin",
|
||||||
"matchit"
|
"matchit",
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, plugin in pairs(disabled_built_ins) do
|
for _, plugin in pairs(disabled_built_ins) do
|
||||||
|
|||||||
@ -1,101 +1,131 @@
|
|||||||
-- leader
|
-- leader
|
||||||
vim.g.mapleader = ' '
|
vim.g.mapleader = " "
|
||||||
|
|
||||||
-- visual block indenting
|
-- visual block indenting
|
||||||
vim.keymap.set('v', '<', '<gv')
|
vim.keymap.set("v", "<", "<gv")
|
||||||
vim.keymap.set('v', '>', '>gv')
|
vim.keymap.set("v", ">", ">gv")
|
||||||
|
|
||||||
-- centered cursor
|
-- centered cursor
|
||||||
vim.keymap.set('n', 'n', 'nzz')
|
vim.keymap.set("n", "n", "nzz")
|
||||||
vim.keymap.set('n', 'N', 'Nzz')
|
vim.keymap.set("n", "N", "Nzz")
|
||||||
vim.keymap.set('n', 'J', 'mzJ`z')
|
vim.keymap.set("n", "J", "mzJ`z")
|
||||||
|
|
||||||
-- escape terminal mode
|
-- escape terminal mode
|
||||||
vim.keymap.set('t', '<Esc>', '<C-\\><C-n>')
|
vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
|
||||||
|
|
||||||
-- newline without entering insert mode
|
-- newline without entering insert mode
|
||||||
vim.keymap.set('n', '<C-J>', 'o<Esc>')
|
vim.keymap.set("n", "<C-J>", "o<Esc>")
|
||||||
vim.keymap.set('n', '<C-K>', 'O<Esc>')
|
vim.keymap.set("n", "<C-K>", "O<Esc>")
|
||||||
|
|
||||||
-- movement
|
-- movement
|
||||||
vim.keymap.set('n', '<leader>h', ':wincmd h<cr>')
|
vim.keymap.set("n", "<leader>h", ":wincmd h<cr>")
|
||||||
vim.keymap.set('n', '<leader>j', ':wincmd j<cr>')
|
vim.keymap.set("n", "<leader>j", ":wincmd j<cr>")
|
||||||
vim.keymap.set('n', '<leader>k', ':wincmd k<cr>')
|
vim.keymap.set("n", "<leader>k", ":wincmd k<cr>")
|
||||||
vim.keymap.set('n', '<leader>l', ':wincmd l<cr>')
|
vim.keymap.set("n", "<leader>l", ":wincmd l<cr>")
|
||||||
|
|
||||||
-- splits and buffers
|
-- splits and buffers
|
||||||
vim.keymap.set('n', '<leader>sv', ':vsplit<CR>')
|
vim.keymap.set("n", "<leader>sv", ":vsplit<CR>")
|
||||||
vim.keymap.set('n', '<leader>sz', ':split<CR>')
|
vim.keymap.set("n", "<leader>sz", ":split<CR>")
|
||||||
vim.keymap.set('n', '<leader>st', ':tabnew<CR>')
|
vim.keymap.set("n", "<leader>st", ":tabnew<CR>")
|
||||||
vim.keymap.set('n', '<leader>sb', ':Telescope buffers<CR>')
|
vim.keymap.set("n", "<leader>sb", ":Telescope buffers<CR>")
|
||||||
vim.keymap.set('n', '<leader>sh', ':tabprevious<cr>')
|
vim.keymap.set("n", "<leader>sh", ":tabprevious<cr>")
|
||||||
vim.keymap.set('n', '<leader>sl', ':tabnext<cr>')
|
vim.keymap.set("n", "<leader>sl", ":tabnext<cr>")
|
||||||
|
|
||||||
-- basics
|
-- basics
|
||||||
vim.keymap.set('n', '<leader>q', ':q<CR>')
|
vim.keymap.set("n", "<leader>q", ":q<CR>")
|
||||||
vim.keymap.set('n', '<leader>Q', ':qa<CR>')
|
vim.keymap.set("n", "<leader>Q", ":qa<CR>")
|
||||||
vim.keymap.set('n', '<leader>x', ':q!<CR>')
|
vim.keymap.set("n", "<leader>x", ":q!<CR>")
|
||||||
vim.keymap.set('n', '<leader>X', ':qa!<CR>')
|
vim.keymap.set("n", "<leader>X", ":qa!<CR>")
|
||||||
vim.keymap.set('n', '<leader>w', ':w<CR>')
|
vim.keymap.set("n", "<leader>w", ":w<CR>")
|
||||||
vim.keymap.set('n', '<leader>W', ':wa<CR>')
|
vim.keymap.set("n", "<leader>W", ":wa<CR>")
|
||||||
vim.keymap.set('n', '<leader>f', ':NvimTreeToggle<CR>')
|
vim.keymap.set("n", "<leader>f", ":NvimTreeToggle<CR>")
|
||||||
vim.keymap.set('n', '<leader>F', ':Telescope find_files<CR>')
|
vim.keymap.set("n", "<leader>F", ":Telescope find_files<CR>")
|
||||||
|
|
||||||
-- toggle term
|
-- toggle term
|
||||||
vim.keymap.set('n', '<leader>c', ':ToggleTermToggleAll<CR>')
|
vim.keymap.set("n", "<leader>c", ":ToggleTermToggleAll<CR>")
|
||||||
vim.keymap.set('n', '<leader>C', ':ToggleTerm<CR>')
|
vim.keymap.set("n", "<leader>C", ":ToggleTerm<CR>")
|
||||||
|
|
||||||
-- frequent actions
|
-- frequent actions
|
||||||
vim.keymap.set('n', '<leader>ar', ':source ~/.config/nvim/init.lua<CR>')
|
vim.keymap.set("n", "<leader>ar", ":source ~/.config/nvim/init.lua<CR>")
|
||||||
vim.keymap.set('n', '<leader>ac', ':cd ~/.config/nvim/<CR>')
|
vim.keymap.set("n", "<leader>ac", ":cd ~/.config/nvim/<CR>")
|
||||||
|
|
||||||
-- keymap switches
|
-- keymap switches
|
||||||
vim.keymap.set('i', '<C-x>', '<Esc>:set keymap=<CR>a')
|
vim.keymap.set("i", "<C-x>", "<Esc>:set keymap=<CR>a")
|
||||||
vim.keymap.set('i', '<C-z>', '<Esc>:set keymap=hebrew<CR>a')
|
vim.keymap.set("i", "<C-z>", "<Esc>:set keymap=hebrew<CR>a")
|
||||||
|
|
||||||
-- telescope
|
-- telescope
|
||||||
vim.keymap.set('n', '<leader>tt', ':Telescope<CR>')
|
vim.keymap.set("n", "<leader>tt", ":Telescope<CR>")
|
||||||
vim.keymap.set('n', '<leader>tl', ':Telescope lsp_dynamic_workspace_symbols<CR>')
|
vim.keymap.set("n", "<leader>tl", ":Telescope lsp_dynamic_workspace_symbols<CR>")
|
||||||
vim.keymap.set('n', '<leader>to', ':Telescope oldfiles<CR>')
|
vim.keymap.set("n", "<leader>to", ":Telescope oldfiles<CR>")
|
||||||
vim.keymap.set('n', '<leader>tg', ':Telescope live_grep<CR>')
|
vim.keymap.set("n", "<leader>tg", ":Telescope live_grep<CR>")
|
||||||
vim.keymap.set('n', '<leader>ts', ':Telescope treesitter<CR>')
|
vim.keymap.set("n", "<leader>ts", ":Telescope treesitter<CR>")
|
||||||
|
|
||||||
-- code
|
-- code
|
||||||
vim.keymap.set('n', '<leader>gf', ':Neoformat<CR>')
|
vim.keymap.set("n", "<leader>gf", ":Neoformat<CR>")
|
||||||
vim.keymap.set('n', '<leader>gd', ':Telescope lsp_definitions<CR>')
|
vim.keymap.set("n", "<leader>gd", ":Telescope lsp_definitions<CR>")
|
||||||
vim.keymap.set('n', '<leader>gi', ':Telescope lsp_implementations<CR>')
|
vim.keymap.set("n", "<leader>gi", ":Telescope lsp_implementations<CR>")
|
||||||
vim.keymap.set('n', '<leader>gr', ':Telescope lsp_references<CR>')
|
vim.keymap.set("n", "<leader>gr", ":Telescope lsp_references<CR>")
|
||||||
vim.keymap.set('n', '<leader>ga', ':Telescope lsp_code_actions<CR>')
|
vim.keymap.set("n", "<leader>ga", ":Telescope lsp_code_actions<CR>")
|
||||||
vim.keymap.set('n', '<leader>gq', ':Telescope diagnostics<CR>')
|
vim.keymap.set("n", "<leader>gq", ":Telescope diagnostics<CR>")
|
||||||
vim.keymap.set('n', '<leader>gD', function() vim.lsp.buf.declaration() end)
|
vim.keymap.set("n", "<leader>gD", function()
|
||||||
vim.keymap.set('n', '<leader>gk', function() vim.lsp.buf.hover() end)
|
vim.lsp.buf.declaration()
|
||||||
vim.keymap.set('n', '<leader>gt', function() vim.lsp.buf.type_definition() end)
|
end)
|
||||||
vim.keymap.set('n', '<leader>gn', function() vim.lsp.buf.rename() end)
|
vim.keymap.set("n", "<leader>gk", function()
|
||||||
vim.keymap.set('n', '<leader>ge', function() vim.lsp.diagnostic.show_line_diagnostics() end)
|
vim.lsp.buf.hover()
|
||||||
vim.keymap.set('n', '[d', function() vim.lsp.diagnostic.goto_prev() end)
|
end)
|
||||||
vim.keymap.set('n', ']d', function() vim.lsp.diagnostic.goto_next() end)
|
vim.keymap.set("n", "<leader>gt", function()
|
||||||
|
vim.lsp.buf.type_definition()
|
||||||
|
end)
|
||||||
|
vim.keymap.set("n", "<leader>gn", function()
|
||||||
|
vim.lsp.buf.rename()
|
||||||
|
end)
|
||||||
|
vim.keymap.set("n", "<leader>ge", function()
|
||||||
|
vim.lsp.diagnostic.show_line_diagnostics()
|
||||||
|
end)
|
||||||
|
vim.keymap.set("n", "[d", function()
|
||||||
|
vim.lsp.diagnostic.goto_prev()
|
||||||
|
end)
|
||||||
|
vim.keymap.set("n", "]d", function()
|
||||||
|
vim.lsp.diagnostic.goto_next()
|
||||||
|
end)
|
||||||
|
|
||||||
-- debug mappings
|
-- debug mappings
|
||||||
vim.keymap.set('n', '<leader>dc', function() require'dap'.continue() end)
|
vim.keymap.set("n", "<leader>dc", function()
|
||||||
vim.keymap.set('n', '<leader>dn', function() require'dap'.step_over() end)
|
require("dap").continue()
|
||||||
vim.keymap.set('n', '<leader>di', function() require'dap'.step_into() end)
|
end)
|
||||||
vim.keymap.set('n', '<leader>do', function() require'dap'.step_out() end)
|
vim.keymap.set("n", "<leader>dn", function()
|
||||||
vim.keymap.set('n', '<leader>db', function() require'dap'.toggle_breakpoint() end)
|
require("dap").step_over()
|
||||||
vim.keymap.set('n', '<leader>dl', function() require'dap'.run_last() end)
|
end)
|
||||||
vim.keymap.set('n', '<leader>dq', function() require'dap'.close() end)
|
vim.keymap.set("n", "<leader>di", function()
|
||||||
vim.keymap.set('n', '<leader>du', function() require'dapui'.toggle() end)
|
require("dap").step_into()
|
||||||
vim.keymap.set('n', '<leader>dv', ':Telescope dap variables<CR>')
|
end)
|
||||||
vim.keymap.set('n', '<leader>dh', ':Telescope dap commands<CR>')
|
vim.keymap.set("n", "<leader>do", function()
|
||||||
vim.keymap.set('n', '<leader>dp', ':Telescope dap list_breakpoints<CR>')
|
require("dap").step_out()
|
||||||
|
end)
|
||||||
|
vim.keymap.set("n", "<leader>db", function()
|
||||||
|
require("dap").toggle_breakpoint()
|
||||||
|
end)
|
||||||
|
vim.keymap.set("n", "<leader>dl", function()
|
||||||
|
require("dap").run_last()
|
||||||
|
end)
|
||||||
|
vim.keymap.set("n", "<leader>dq", function()
|
||||||
|
require("dap").close()
|
||||||
|
end)
|
||||||
|
vim.keymap.set("n", "<leader>du", function()
|
||||||
|
require("dapui").toggle()
|
||||||
|
end)
|
||||||
|
vim.keymap.set("n", "<leader>dv", ":Telescope dap variables<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>dh", ":Telescope dap commands<CR>")
|
||||||
|
vim.keymap.set("n", "<leader>dp", ":Telescope dap list_breakpoints<CR>")
|
||||||
|
|
||||||
-- git
|
-- git
|
||||||
vim.keymap.set('n', '<leader>vs', ':Git<CR>')
|
vim.keymap.set("n", "<leader>vs", ":Git<CR>")
|
||||||
vim.keymap.set('n', '<leader>vb', ':Telescope git_branches<CR>')
|
vim.keymap.set("n", "<leader>vb", ":Telescope git_branches<CR>")
|
||||||
vim.keymap.set('n', '<leader>vc', ':Telescope git_commits<CR>')
|
vim.keymap.set("n", "<leader>vc", ":Telescope git_commits<CR>")
|
||||||
vim.keymap.set('n', '<leader>vf', ':Telescope git_files<CR>')
|
vim.keymap.set("n", "<leader>vf", ":Telescope git_files<CR>")
|
||||||
|
|
||||||
-- vsnip jumpable mappings
|
-- vsnip jumpable mappings
|
||||||
vim.keymap.set('i', '<Tab>', "vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'", {expr = true})
|
vim.keymap.set("i", "<Tab>", "vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'", { expr = true })
|
||||||
vim.keymap.set('s', '<Tab>', "vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'", {expr = true})
|
vim.keymap.set("s", "<Tab>", "vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : '<Tab>'", { expr = true })
|
||||||
vim.keymap.set('i', '<S-Tab>', "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'", {expr = true})
|
vim.keymap.set("i", "<S-Tab>", "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'", { expr = true })
|
||||||
vim.keymap.set('s', '<S-Tab>', "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'", {expr = true})
|
vim.keymap.set("s", "<S-Tab>", "vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : '<S-Tab>'", { expr = true })
|
||||||
|
|||||||
@ -1,32 +1,30 @@
|
|||||||
local cmd = vim.cmd
|
|
||||||
local opt = vim.opt
|
|
||||||
local g = vim.g
|
|
||||||
|
|
||||||
-- sensible settings
|
-- sensible settings
|
||||||
opt.autoread = true
|
vim.opt.autoread = true
|
||||||
opt.clipboard = 'unnamedplus'
|
vim.opt.clipboard = "unnamedplus"
|
||||||
opt.conceallevel = 0
|
vim.opt.conceallevel = 0
|
||||||
opt.hlsearch = false
|
vim.opt.hlsearch = false
|
||||||
opt.lazyredraw = true
|
vim.opt.lazyredraw = true
|
||||||
opt.mouse = 'a'
|
vim.opt.mouse = "a"
|
||||||
opt.nu = true
|
vim.opt.nu = true
|
||||||
opt.rnu = true
|
vim.opt.rnu = true
|
||||||
opt.scrolloff = 10
|
vim.opt.scrolloff = 10
|
||||||
opt.shortmess = 'c'
|
vim.opt.shortmess = "c"
|
||||||
opt.showcmd = true
|
vim.opt.showcmd = true
|
||||||
opt.showmode = false
|
vim.opt.showmode = false
|
||||||
opt.sw = 4
|
vim.opt.sw = 4
|
||||||
opt.swapfile = false
|
vim.opt.swapfile = false
|
||||||
opt.timeoutlen = 500
|
vim.opt.timeoutlen = 500
|
||||||
opt.ts = 4
|
vim.opt.ts = 4
|
||||||
opt.laststatus = 3
|
vim.opt.laststatus = 3
|
||||||
-- opt.wrap = false
|
|
||||||
|
|
||||||
-- :JsonFormat command using jq
|
-- :jq command using jq
|
||||||
cmd 'autocmd FileType json :command! JsonFormat %!jq .'
|
vim.api.nvim_create_autocmd("FileType", {
|
||||||
|
pattern = "json",
|
||||||
|
command = ":command! JsonFormat %!jq",
|
||||||
|
})
|
||||||
|
|
||||||
-- trigger autoread on file change
|
-- trigger autoread on file change
|
||||||
cmd "autocmd FocusGained,BufEnter,CursorHold,CursorHoldI * if mode() != 'c' | checktime | endif"
|
vim.api.nvim_create_autocmd({ "FocusGained", "BufEnter", "CursorHold", "CursorHoldI" }, {
|
||||||
|
pattern = "*",
|
||||||
-- neovim-qt font
|
command = "if mode() != 'c' | checktime | endif",
|
||||||
opt.guifont = 'DejaVu\\ Sans\\ Mono:h14'
|
})
|
||||||
|
|||||||
@ -1,231 +1,268 @@
|
|||||||
require('packer').startup(function()
|
require("packer").startup(function()
|
||||||
use 'wbthomason/packer.nvim'
|
use("wbthomason/packer.nvim")
|
||||||
|
|
||||||
--
|
--
|
||||||
-- LSP
|
-- LSP
|
||||||
--
|
--
|
||||||
|
|
||||||
-- lspconfig
|
-- lspconfig
|
||||||
use {
|
use({
|
||||||
'neovim/nvim-lspconfig',
|
"neovim/nvim-lspconfig",
|
||||||
event = 'BufEnter',
|
event = "BufEnter",
|
||||||
config = function() require('plugins.lsp') end
|
config = function()
|
||||||
}
|
require("plugins.lsp")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- nvim lint
|
-- nvim lint
|
||||||
use {
|
use({
|
||||||
'mfussenegger/nvim-lint',
|
"mfussenegger/nvim-lint",
|
||||||
event = 'BufWrite',
|
event = "BufWrite",
|
||||||
config = function() require('plugins.lint') end
|
config = function()
|
||||||
}
|
require("plugins.lint")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
--
|
--
|
||||||
-- completion
|
-- completion
|
||||||
--
|
--
|
||||||
|
|
||||||
-- cmp
|
-- cmp
|
||||||
use {
|
use({
|
||||||
'hrsh7th/nvim-cmp',
|
"hrsh7th/nvim-cmp",
|
||||||
event = 'InsertEnter',
|
event = "InsertEnter",
|
||||||
config = function() require('plugins.cmp') end
|
config = function()
|
||||||
}
|
require("plugins.cmp")
|
||||||
use {
|
end,
|
||||||
'hrsh7th/cmp-nvim-lsp',
|
})
|
||||||
after = 'nvim-cmp'
|
use({
|
||||||
}
|
"hrsh7th/cmp-nvim-lsp",
|
||||||
use {
|
after = "nvim-cmp",
|
||||||
'hrsh7th/cmp-vsnip',
|
})
|
||||||
after = 'nvim-cmp'
|
use({
|
||||||
}
|
"hrsh7th/cmp-vsnip",
|
||||||
use {
|
after = "nvim-cmp",
|
||||||
'hrsh7th/cmp-buffer',
|
})
|
||||||
after = 'nvim-cmp'
|
use({
|
||||||
}
|
"hrsh7th/cmp-buffer",
|
||||||
use {
|
after = "nvim-cmp",
|
||||||
'hrsh7th/cmp-path',
|
})
|
||||||
after = 'nvim-cmp'
|
use({
|
||||||
}
|
"hrsh7th/cmp-path",
|
||||||
|
after = "nvim-cmp",
|
||||||
|
})
|
||||||
|
|
||||||
-- snippets
|
-- snippets
|
||||||
use {
|
use({
|
||||||
'hrsh7th/vim-vsnip',
|
"hrsh7th/vim-vsnip",
|
||||||
after = 'nvim-cmp'
|
after = "nvim-cmp",
|
||||||
}
|
})
|
||||||
|
|
||||||
use {
|
use({
|
||||||
'rafamadriz/friendly-snippets',
|
"rafamadriz/friendly-snippets",
|
||||||
after = 'vim-vsnip'
|
after = "vim-vsnip",
|
||||||
}
|
})
|
||||||
|
|
||||||
-- lsp signature
|
-- lsp signature
|
||||||
use {
|
use({
|
||||||
'ray-x/lsp_signature.nvim',
|
"ray-x/lsp_signature.nvim",
|
||||||
config = function() require('plugins.lspsignature') end
|
config = function()
|
||||||
}
|
require("plugins.lspsignature")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- autopairs
|
-- autopairs
|
||||||
use {
|
use({
|
||||||
'windwp/nvim-autopairs',
|
"windwp/nvim-autopairs",
|
||||||
after = 'nvim-cmp',
|
after = "nvim-cmp",
|
||||||
config = function() require('plugins.autopairs') end
|
config = function()
|
||||||
}
|
require("plugins.autopairs")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- treesitter
|
-- treesitter
|
||||||
use {
|
use({
|
||||||
'nvim-treesitter/nvim-treesitter',
|
"nvim-treesitter/nvim-treesitter",
|
||||||
event = 'BufEnter',
|
event = "BufEnter",
|
||||||
config = function() require('plugins.treesitter') end
|
config = function()
|
||||||
}
|
require("plugins.treesitter")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- dap
|
-- dap
|
||||||
use {
|
use({
|
||||||
'mfussenegger/nvim-dap',
|
"mfussenegger/nvim-dap",
|
||||||
module = 'dap',
|
module = "dap",
|
||||||
config = function() require('plugins.dap') end
|
config = function()
|
||||||
}
|
require("plugins.dap")
|
||||||
use {
|
end,
|
||||||
'nvim-telescope/telescope-dap.nvim',
|
})
|
||||||
after = 'nvim-dap'
|
use({
|
||||||
}
|
"nvim-telescope/telescope-dap.nvim",
|
||||||
use {
|
after = "nvim-dap",
|
||||||
'rcarriga/nvim-dap-ui',
|
})
|
||||||
after = 'nvim-dap',
|
use({
|
||||||
config = function() require('plugins.dapui') end
|
"rcarriga/nvim-dap-ui",
|
||||||
}
|
after = "nvim-dap",
|
||||||
use {
|
config = function()
|
||||||
'leoluz/nvim-dap-go',
|
require("plugins.dapui")
|
||||||
after = 'nvim-dap',
|
end,
|
||||||
config = function() require('plugins.dap-go') end
|
})
|
||||||
}
|
use({
|
||||||
use {
|
"leoluz/nvim-dap-go",
|
||||||
'theHamsta/nvim-dap-virtual-text',
|
after = "nvim-dap",
|
||||||
after = 'nvim-dap',
|
config = function()
|
||||||
config = function() require('plugins.dap-virtual-text') end
|
require("plugins.dap-go")
|
||||||
}
|
end,
|
||||||
|
})
|
||||||
|
use({
|
||||||
|
"theHamsta/nvim-dap-virtual-text",
|
||||||
|
after = "nvim-dap",
|
||||||
|
config = function()
|
||||||
|
require("plugins.dap-virtual-text")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- toggleterm
|
-- toggleterm
|
||||||
use {
|
use({
|
||||||
'akinsho/toggleterm.nvim',
|
"akinsho/toggleterm.nvim",
|
||||||
cmd = 'ToggleTerm*',
|
cmd = "ToggleTerm*",
|
||||||
config = function() require('plugins.toggleterm') end
|
config = function()
|
||||||
}
|
require("plugins.toggleterm")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- neoformat
|
-- neoformat
|
||||||
use {
|
use({
|
||||||
'sbdchd/neoformat',
|
"sbdchd/neoformat",
|
||||||
cmd = 'Neoformat',
|
cmd = "Neoformat",
|
||||||
config = function() require('plugins.neoformat') end
|
config = function()
|
||||||
}
|
require("plugins.neoformat")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- comment.nvim
|
-- comment.nvim
|
||||||
use {
|
use({
|
||||||
'numToStr/Comment.nvim',
|
"numToStr/Comment.nvim",
|
||||||
event = 'BufRead',
|
event = "BufRead",
|
||||||
config = function() require('plugins.comment') end
|
config = function()
|
||||||
}
|
require("plugins.comment")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- fugitive
|
-- fugitive
|
||||||
use {
|
use({
|
||||||
'tpope/vim-fugitive',
|
"tpope/vim-fugitive",
|
||||||
}
|
})
|
||||||
|
|
||||||
--
|
--
|
||||||
-- files (and more)
|
-- files (and more)
|
||||||
--
|
--
|
||||||
|
|
||||||
-- telescope
|
-- telescope
|
||||||
use {
|
use({
|
||||||
'nvim-telescope/telescope.nvim',
|
"nvim-telescope/telescope.nvim",
|
||||||
cmd = 'Telescope',
|
cmd = "Telescope",
|
||||||
requires = {'nvim-lua/plenary.nvim'},
|
requires = { "nvim-lua/plenary.nvim" },
|
||||||
config = function() require('plugins.telescope') end
|
config = function()
|
||||||
}
|
require("plugins.telescope")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
-- nvim tree
|
-- nvim tree
|
||||||
use {
|
use({
|
||||||
'kyazdani42/nvim-tree.lua',
|
"kyazdani42/nvim-tree.lua",
|
||||||
requires = 'kyazdani42/nvim-web-devicons',
|
requires = "kyazdani42/nvim-web-devicons",
|
||||||
config = function() require('plugins.nvim-tree') end
|
config = function()
|
||||||
}
|
require("plugins.nvim-tree")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
--
|
--
|
||||||
-- looks
|
-- looks
|
||||||
--
|
--
|
||||||
|
|
||||||
-- lualine
|
-- lualine
|
||||||
use {
|
use({
|
||||||
'hoob3rt/lualine.nvim',
|
"hoob3rt/lualine.nvim",
|
||||||
config = function() require('plugins.lualine') end
|
config = function()
|
||||||
}
|
require("plugins.lualine")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
--
|
--
|
||||||
-- colorscheme
|
-- colorscheme
|
||||||
--
|
--
|
||||||
|
|
||||||
use {
|
use({
|
||||||
-- 'crusoexia/vim-monokai',
|
-- 'crusoexia/vim-monokai',
|
||||||
'dylanaraps/wal.vim',
|
"dylanaraps/wal.vim",
|
||||||
after = 'nvim-treesitter'
|
after = "nvim-treesitter",
|
||||||
}
|
})
|
||||||
|
|
||||||
--
|
--
|
||||||
-- qol
|
-- qol
|
||||||
--
|
--
|
||||||
|
|
||||||
-- blankline
|
-- blankline
|
||||||
use {
|
use({
|
||||||
'lukas-reineke/indent-blankline.nvim',
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
event = 'VimEnter'
|
event = "VimEnter",
|
||||||
}
|
})
|
||||||
|
|
||||||
-- highlight yank
|
-- highlight yank
|
||||||
use {
|
use({
|
||||||
'machakann/vim-highlightedyank',
|
"machakann/vim-highlightedyank",
|
||||||
event = 'TextYankPost'
|
event = "TextYankPost",
|
||||||
}
|
})
|
||||||
|
|
||||||
-- tabular
|
-- tabular
|
||||||
use {
|
use({
|
||||||
'godlygeek/tabular',
|
"godlygeek/tabular",
|
||||||
cmd = 'Tabularize'
|
cmd = "Tabularize",
|
||||||
}
|
})
|
||||||
|
|
||||||
-- maximizer
|
-- maximizer
|
||||||
use {
|
use({
|
||||||
'szw/vim-maximizer',
|
"szw/vim-maximizer",
|
||||||
cmd = 'MaximizerToggle'
|
cmd = "MaximizerToggle",
|
||||||
}
|
})
|
||||||
|
|
||||||
-- whichkey
|
-- whichkey
|
||||||
use {
|
use({
|
||||||
'folke/which-key.nvim',
|
"folke/which-key.nvim",
|
||||||
config = function() require('plugins.whichkey') end
|
config = function()
|
||||||
}
|
require("plugins.whichkey")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
--
|
--
|
||||||
-- filetype specific
|
-- filetype specific
|
||||||
--
|
--
|
||||||
|
|
||||||
-- csv
|
-- csv
|
||||||
use {
|
use({
|
||||||
'chrisbra/csv.vim',
|
"chrisbra/csv.vim",
|
||||||
ft = 'csv'
|
ft = "csv",
|
||||||
}
|
})
|
||||||
|
|
||||||
-- latex
|
-- latex
|
||||||
use {
|
use({
|
||||||
'lervag/vimtex',
|
"lervag/vimtex",
|
||||||
ft = 'tex',
|
ft = "tex",
|
||||||
config = function() require('plugins.vimtex') end
|
config = function()
|
||||||
}
|
require("plugins.vimtex")
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
--
|
--
|
||||||
-- misc
|
-- misc
|
||||||
--
|
--
|
||||||
|
|
||||||
use {
|
use({
|
||||||
'vimwiki/vimwiki',
|
"vimwiki/vimwiki",
|
||||||
config = function() require('plugins.vimwiki') end
|
config = function()
|
||||||
}
|
require("plugins.vimwiki")
|
||||||
|
end,
|
||||||
|
})
|
||||||
end)
|
end)
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
-- autopairs
|
-- autopairs
|
||||||
require('nvim-autopairs').setup{}
|
require("nvim-autopairs").setup({})
|
||||||
-- insert () after selecting functions
|
-- insert () after selecting functions
|
||||||
local cmp_autopairs = require('nvim-autopairs.completion.cmp')
|
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
|
||||||
local cmp = require('cmp')
|
local cmp = require("cmp")
|
||||||
cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } }))
|
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({ map_char = { tex = "" } }))
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
vim.opt.completeopt = { 'menuone', 'noselect' }
|
vim.opt.completeopt = { "menuone", "noselect" }
|
||||||
|
|
||||||
local cmp = require'cmp'
|
local cmp = require("cmp")
|
||||||
|
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
snippet = {
|
snippet = {
|
||||||
@ -11,19 +11,19 @@ cmp.setup({
|
|||||||
mapping = {
|
mapping = {
|
||||||
-- ['<C-n>'] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
|
-- ['<C-n>'] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
|
||||||
-- ['<C-p>'] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
|
-- ['<C-p>'] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
|
||||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
["<C-n>"] = cmp.mapping.select_next_item(),
|
||||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
["<C-p>"] = cmp.mapping.select_prev_item(),
|
||||||
['<C-Space>'] = cmp.mapping.complete(),
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
['<C-e>'] = cmp.mapping.close(),
|
["<C-e>"] = cmp.mapping.close(),
|
||||||
['<CR>'] = cmp.mapping.confirm({
|
["<CR>"] = cmp.mapping.confirm({
|
||||||
behavior = cmp.ConfirmBehavior.Replace,
|
behavior = cmp.ConfirmBehavior.Replace,
|
||||||
select = false
|
select = false,
|
||||||
})
|
}),
|
||||||
},
|
},
|
||||||
sources = {
|
sources = {
|
||||||
{ name = 'path' },
|
{ name = "path" },
|
||||||
{ name = 'nvim_lsp' },
|
{ name = "nvim_lsp" },
|
||||||
{ name = 'buffer' },
|
{ name = "buffer" },
|
||||||
{ name = 'vsnip' }
|
{ name = "vsnip" },
|
||||||
}
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
require ('dap-go').setup()
|
require("dap-go").setup()
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
require'nvim-dap-virtual-text'.setup()
|
require("nvim-dap-virtual-text").setup()
|
||||||
|
|||||||
@ -1,32 +1,32 @@
|
|||||||
local dap = require('dap')
|
local dap = require("dap")
|
||||||
|
|
||||||
--
|
--
|
||||||
-- python
|
-- python
|
||||||
--
|
--
|
||||||
|
|
||||||
dap.adapters.python = {
|
dap.adapters.python = {
|
||||||
type = 'executable';
|
type = "executable",
|
||||||
command = 'python';
|
command = "python",
|
||||||
args = { '-m', 'debugpy.adapter' };
|
args = { "-m", "debugpy.adapter" },
|
||||||
}
|
}
|
||||||
|
|
||||||
dap.configurations.python = {
|
dap.configurations.python = {
|
||||||
{
|
{
|
||||||
type = 'python';
|
type = "python",
|
||||||
request = 'launch';
|
request = "launch",
|
||||||
name = "Launch file";
|
name = "Launch file",
|
||||||
|
|
||||||
program = "${file}";
|
program = "${file}",
|
||||||
pythonPath = function()
|
pythonPath = function()
|
||||||
local cwd = vim.fn.getcwd()
|
local cwd = vim.fn.getcwd()
|
||||||
if vim.fn.executable(cwd .. '/venv/bin/python') == 1 then
|
if vim.fn.executable(cwd .. "/venv/bin/python") == 1 then
|
||||||
return cwd .. '/venv/bin/python'
|
return cwd .. "/venv/bin/python"
|
||||||
elseif vim.fn.executable(cwd .. '/.venv/bin/python') == 1 then
|
elseif vim.fn.executable(cwd .. "/.venv/bin/python") == 1 then
|
||||||
return cwd .. '/.venv/bin/python'
|
return cwd .. "/.venv/bin/python"
|
||||||
else
|
else
|
||||||
return '/usr/bin/python'
|
return "/usr/bin/python"
|
||||||
end
|
end
|
||||||
end;
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -35,9 +35,9 @@ dap.configurations.python = {
|
|||||||
--
|
--
|
||||||
|
|
||||||
dap.adapters.lldb = {
|
dap.adapters.lldb = {
|
||||||
type = 'executable',
|
type = "executable",
|
||||||
command = '/usr/bin/lldb-vscode',
|
command = "/usr/bin/lldb-vscode",
|
||||||
name = "lldb"
|
name = "lldb",
|
||||||
}
|
}
|
||||||
|
|
||||||
dap.configurations.c = {
|
dap.configurations.c = {
|
||||||
@ -46,9 +46,9 @@ dap.configurations.c = {
|
|||||||
type = "lldb",
|
type = "lldb",
|
||||||
request = "launch",
|
request = "launch",
|
||||||
program = function()
|
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,
|
end,
|
||||||
cwd = '${workspaceFolder}',
|
cwd = "${workspaceFolder}",
|
||||||
stopOnEntry = false,
|
stopOnEntry = false,
|
||||||
args = {},
|
args = {},
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
require('lint').linters_by_ft = {
|
require("lint").linters_by_ft = {
|
||||||
python = {'mypy'}
|
python = { "mypy" },
|
||||||
}
|
}
|
||||||
|
|
||||||
vim.cmd("au BufWrite <buffer> lua require('lint').try_lint()")
|
vim.cmd("au BufWrite <buffer> lua require('lint').try_lint()")
|
||||||
|
|||||||
@ -1,16 +1,16 @@
|
|||||||
local lsp = require('lspconfig')
|
local lsp = require("lspconfig")
|
||||||
|
|
||||||
-- language servers
|
-- language servers
|
||||||
lsp.pyright.setup{
|
lsp.pyright.setup({
|
||||||
settings = {
|
settings = {
|
||||||
python = {
|
python = {
|
||||||
analysis = {
|
analysis = {
|
||||||
typeCheckingMode = "off"
|
typeCheckingMode = "off",
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}
|
})
|
||||||
lsp.gopls.setup{}
|
lsp.gopls.setup({})
|
||||||
lsp.clangd.setup{}
|
lsp.clangd.setup({})
|
||||||
lsp.texlab.setup{}
|
lsp.texlab.setup({})
|
||||||
lsp.rust_analyzer.setup{}
|
lsp.rust_analyzer.setup({})
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
cfg = {
|
cfg = {
|
||||||
hint_prefix = " ",
|
hint_prefix = " ",
|
||||||
handler_opts = {
|
handler_opts = {
|
||||||
border = "none"
|
border = "none",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
require "lsp_signature".setup(cfg)
|
require("lsp_signature").setup(cfg)
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
-- lualine colorscheme
|
-- lualine colorscheme
|
||||||
require('lualine').setup{
|
require("lualine").setup({
|
||||||
options = {
|
options = {
|
||||||
theme = 'auto',
|
theme = "auto",
|
||||||
section_separators = {'', ''},
|
section_separators = { "", "" },
|
||||||
component_separators = {'', ''}
|
component_separators = { "", "" },
|
||||||
}
|
},
|
||||||
}
|
})
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
vim.g.neoformat_enabled_python = {'yapf'}
|
vim.g.neoformat_enabled_python = { "yapf" }
|
||||||
|
|||||||
@ -1,9 +1,13 @@
|
|||||||
-- nvim tree
|
-- nvim tree
|
||||||
require'nvim-tree'.setup{
|
require("nvim-tree").setup({
|
||||||
update_cwd = true,
|
update_cwd = true,
|
||||||
diagnostics = {
|
diagnostics = {
|
||||||
enable = true,
|
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",
|
||||||
|
})
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
-- telescope settings
|
-- telescope settings
|
||||||
require('telescope').setup{
|
require("telescope").setup({
|
||||||
defaults = {
|
defaults = {
|
||||||
-- sorting
|
-- sorting
|
||||||
file_sorter = require'telescope.sorters'.get_fzy_sorter,
|
file_sorter = require("telescope.sorters").get_fzy_sorter,
|
||||||
generic_sorter = require'telescope.sorters'.get_fzy_sorter,
|
generic_sorter = require("telescope.sorters").get_fzy_sorter,
|
||||||
}
|
},
|
||||||
}
|
})
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
vim.o.hidden = true
|
vim.o.hidden = true
|
||||||
require("toggleterm").setup{}
|
require("toggleterm").setup({})
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
require'nvim-treesitter.configs'.setup {
|
require("nvim-treesitter.configs").setup({
|
||||||
highlight = {
|
highlight = {
|
||||||
enable = true,
|
enable = true,
|
||||||
},
|
},
|
||||||
}
|
})
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
-- ignore certain errors
|
-- 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
|
-- use zathura as the pdf viewer
|
||||||
vim.g.vimtex_view_general_viewer = 'zathura'
|
vim.g.vimtex_view_general_viewer = "zathura"
|
||||||
|
|||||||
@ -2,7 +2,7 @@ local wk = require("which-key")
|
|||||||
wk.register({
|
wk.register({
|
||||||
a = {
|
a = {
|
||||||
name = "Actions",
|
name = "Actions",
|
||||||
r = "Reload Config"
|
r = "Reload Config",
|
||||||
},
|
},
|
||||||
d = {
|
d = {
|
||||||
name = "Debug",
|
name = "Debug",
|
||||||
@ -16,7 +16,7 @@ wk.register({
|
|||||||
p = "List Breakpoints",
|
p = "List Breakpoints",
|
||||||
q = "Stop",
|
q = "Stop",
|
||||||
u = "Toggle UI",
|
u = "Toggle UI",
|
||||||
v = "Show Variables"
|
v = "Show Variables",
|
||||||
},
|
},
|
||||||
g = {
|
g = {
|
||||||
name = "Language",
|
name = "Language",
|
||||||
@ -30,7 +30,7 @@ wk.register({
|
|||||||
n = "Rename",
|
n = "Rename",
|
||||||
q = "Show Diagnostics",
|
q = "Show Diagnostics",
|
||||||
r = "Show References",
|
r = "Show References",
|
||||||
t = "Show Type Definition"
|
t = "Show Type Definition",
|
||||||
},
|
},
|
||||||
s = {
|
s = {
|
||||||
name = "Splits & Buffers",
|
name = "Splits & Buffers",
|
||||||
@ -68,6 +68,6 @@ wk.register({
|
|||||||
l = "Right Split",
|
l = "Right Split",
|
||||||
q = "Quit",
|
q = "Quit",
|
||||||
s = "Save",
|
s = "Save",
|
||||||
x = "Quit Without Saving"
|
x = "Quit Without Saving",
|
||||||
}, { prefix = "<leader>" })
|
}, { prefix = "<leader>" })
|
||||||
wk.setup{}
|
wk.setup({})
|
||||||
|
|||||||
Reference in New Issue
Block a user