chore: format all lua files
This commit is contained in:
@@ -2,7 +2,9 @@ local version = vim.version()
|
|||||||
|
|
||||||
if version.major == 0 then
|
if version.major == 0 then
|
||||||
if version.minor < 11 then
|
if version.minor < 11 then
|
||||||
error("Neovim version 0.11 or above is required with this configuration.")
|
error(
|
||||||
|
"Neovim version 0.11 or above is required with this configuration."
|
||||||
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -16,7 +18,7 @@ if not vim.uv.fs_stat(lazypath) then
|
|||||||
util.assert_installed("cc")
|
util.assert_installed("cc")
|
||||||
end
|
end
|
||||||
util.assert_installed("make")
|
util.assert_installed("make")
|
||||||
util.assert_any_installed({ "curl", "wget", })
|
util.assert_any_installed({ "curl", "wget" })
|
||||||
util.assert_installed("unzip")
|
util.assert_installed("unzip")
|
||||||
util.assert_installed("tar")
|
util.assert_installed("tar")
|
||||||
util.assert_installed("gzip")
|
util.assert_installed("gzip")
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ vim.api.nvim_create_autocmd("FileType", {
|
|||||||
vim.api.nvim_create_autocmd("TermLeave", {
|
vim.api.nvim_create_autocmd("TermLeave", {
|
||||||
desc = "Reload buffers when leaving terminal",
|
desc = "Reload buffers when leaving terminal",
|
||||||
pattern = "*",
|
pattern = "*",
|
||||||
callback = function ()
|
callback = function()
|
||||||
vim.cmd.checktime()
|
vim.cmd.checktime()
|
||||||
end
|
end,
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -2,15 +2,15 @@ vim.g.mapleader = " "
|
|||||||
vim.g.vimsyn_embed = "lpP"
|
vim.g.vimsyn_embed = "lpP"
|
||||||
vim.g.netrw_banner = 0
|
vim.g.netrw_banner = 0
|
||||||
vim.g.netrw_liststyle = 1
|
vim.g.netrw_liststyle = 1
|
||||||
vim.g.netrw_list_hide = '\\.venv/,\\.git/'
|
vim.g.netrw_list_hide = "\\.venv/,\\.git/"
|
||||||
vim.g.netrw_maxfilenamelen = 47
|
vim.g.netrw_maxfilenamelen = 47
|
||||||
vim.g.netrw_mousemaps = 0
|
vim.g.netrw_mousemaps = 0
|
||||||
vim.g.netrw_sizestyle = 'H'
|
vim.g.netrw_sizestyle = "H"
|
||||||
vim.g.netrw_sort_by = 'name'
|
vim.g.netrw_sort_by = "name"
|
||||||
vim.g.netrw_sort_options = 'i'
|
vim.g.netrw_sort_options = "i"
|
||||||
vim.g.netrw_sort_sequence = '[\\/]\\s*,*'
|
vim.g.netrw_sort_sequence = "[\\/]\\s*,*"
|
||||||
vim.g.netrw_special_syntax = 1
|
vim.g.netrw_special_syntax = 1
|
||||||
vim.g.netrw_timefmt = '%d-%m-%Y %H:%M'
|
vim.g.netrw_timefmt = "%d-%m-%Y %H:%M"
|
||||||
vim.g.c_syntax_for_h = 1
|
vim.g.c_syntax_for_h = 1
|
||||||
vim.g.python_indent = {
|
vim.g.python_indent = {
|
||||||
open_paren = "shiftwidth()",
|
open_paren = "shiftwidth()",
|
||||||
|
|||||||
+39
-39
@@ -3,18 +3,18 @@ vim.keymap.set("n", "tn", vim.cmd.tabnew)
|
|||||||
vim.keymap.set("n", "tq", vim.cmd.tabclose)
|
vim.keymap.set("n", "tq", vim.cmd.tabclose)
|
||||||
|
|
||||||
-- Clipboard
|
-- Clipboard
|
||||||
if vim.env.TMUX and vim.fn.executable('tmux') then
|
if vim.env.TMUX and vim.fn.executable("tmux") then
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
{ "n", "x" },
|
{ "n", "x" },
|
||||||
"<leader>y",
|
"<leader>y",
|
||||||
"\"+y:call system('tmux load-buffer -w -', @+)<CR>"
|
"\"+y:call system('tmux load-buffer -w -', @+)<CR>"
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
vim.keymap.set({ "n", "x", }, "<leader>y", '"+y')
|
vim.keymap.set({ "n", "x" }, "<leader>y", '"+y')
|
||||||
end
|
end
|
||||||
vim.keymap.set({ "n", "x", }, "<leader>p", '"+p')
|
vim.keymap.set({ "n", "x" }, "<leader>p", '"+p')
|
||||||
vim.keymap.set({ "n", "x", }, "<leader>P", '"+P')
|
vim.keymap.set({ "n", "x" }, "<leader>P", '"+P')
|
||||||
vim.keymap.set({ "n", "x", }, "<leader>+", ":call setreg('+', @\")<CR>")
|
vim.keymap.set({ "n", "x" }, "<leader>+", ":call setreg('+', @\")<CR>")
|
||||||
|
|
||||||
-- Allow exiting insert mode in terminal by hitting <ESC>
|
-- Allow exiting insert mode in terminal by hitting <ESC>
|
||||||
vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
|
vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
|
||||||
@@ -29,8 +29,8 @@ vim.keymap.set("t", "<C-\\>", function()
|
|||||||
end)
|
end)
|
||||||
|
|
||||||
-- Use :diffput/get instead of normal one to allow staging visual selection
|
-- Use :diffput/get instead of normal one to allow staging visual selection
|
||||||
vim.keymap.set({"n", "x"}, "<leader>dp", ":diffput<CR>")
|
vim.keymap.set({ "n", "x" }, "<leader>dp", ":diffput<CR>")
|
||||||
vim.keymap.set({"n", "x"}, "<leader>do", ":diffget<CR>")
|
vim.keymap.set({ "n", "x" }, "<leader>do", ":diffget<CR>")
|
||||||
|
|
||||||
local close_pum = function()
|
local close_pum = function()
|
||||||
if vim.fn.pumvisible() ~= 0 then
|
if vim.fn.pumvisible() ~= 0 then
|
||||||
@@ -51,52 +51,52 @@ end, { expr = true })
|
|||||||
vim.keymap.set("n", "<C-w>q", ":bp | bd#<CR>")
|
vim.keymap.set("n", "<C-w>q", ":bp | bd#<CR>")
|
||||||
|
|
||||||
-- Allow (de)indenting without deselecting
|
-- Allow (de)indenting without deselecting
|
||||||
vim.keymap.set({"x"}, "<", "<gv")
|
vim.keymap.set({ "x" }, "<", "<gv")
|
||||||
vim.keymap.set({"x"}, ">", ">gv")
|
vim.keymap.set({ "x" }, ">", ">gv")
|
||||||
|
|
||||||
-- Remove default mappings
|
-- Remove default mappings
|
||||||
vim.keymap.set("", "<C-LeftMouse>", "")
|
vim.keymap.set("", "<C-LeftMouse>", "")
|
||||||
vim.keymap.set('n', 'K', function()
|
vim.keymap.set("n", "K", function()
|
||||||
if vim.bo.filetype == 'vim' or vim.bo.filetype == 'help' then
|
if vim.bo.filetype == "vim" or vim.bo.filetype == "help" then
|
||||||
vim.cmd('help ' .. vim.fn.expand('<cword>'))
|
vim.cmd("help " .. vim.fn.expand("<cword>"))
|
||||||
else
|
else
|
||||||
vim.cmd('Man ' .. vim.fn.expand('<cword>'))
|
vim.cmd("Man " .. vim.fn.expand("<cword>"))
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
-- Remove right-click menu items
|
-- Remove right-click menu items
|
||||||
vim.cmd.aunmenu({ "PopUp.-1-", })
|
vim.cmd.aunmenu({ "PopUp.-1-" })
|
||||||
vim.cmd.aunmenu({ "PopUp.How-to\\ disable\\ mouse", })
|
vim.cmd.aunmenu({ "PopUp.How-to\\ disable\\ mouse" })
|
||||||
|
|
||||||
-- Insert-mode Emacs bindings
|
-- Insert-mode Emacs bindings
|
||||||
vim.keymap.set('i', '<C-f>', '<Right>')
|
vim.keymap.set("i", "<C-f>", "<Right>")
|
||||||
vim.keymap.set('i', '<C-b>', '<Left>')
|
vim.keymap.set("i", "<C-b>", "<Left>")
|
||||||
vim.keymap.set('i', '<C-a>', '<C-o>^')
|
vim.keymap.set("i", "<C-a>", "<C-o>^")
|
||||||
vim.keymap.set('i', '<C-e>', '<C-o>$')
|
vim.keymap.set("i", "<C-e>", "<C-o>$")
|
||||||
-- vim.keymap.set('i', '<C-d>', '<C-o>x') -- Overrides de-indent
|
-- vim.keymap.set('i', '<C-d>', '<C-o>x') -- Overrides de-indent
|
||||||
vim.keymap.set('i', '<M-f>', '<C-o>w')
|
vim.keymap.set("i", "<M-f>", "<C-o>w")
|
||||||
vim.keymap.set('i', '<M-b>', '<C-o>b')
|
vim.keymap.set("i", "<M-b>", "<C-o>b")
|
||||||
vim.keymap.set('i', '<M-d>', '<C-o>dw')
|
vim.keymap.set("i", "<M-d>", "<C-o>dw")
|
||||||
vim.keymap.set('i', '<M-BS>', '<C-o>db')
|
vim.keymap.set("i", "<M-BS>", "<C-o>db")
|
||||||
|
|
||||||
-- Command-mode Emacs bindings
|
-- Command-mode Emacs bindings
|
||||||
vim.keymap.set('c', '<C-f>', '<Right>')
|
vim.keymap.set("c", "<C-f>", "<Right>")
|
||||||
vim.keymap.set('c', '<C-b>', '<Left>')
|
vim.keymap.set("c", "<C-b>", "<Left>")
|
||||||
vim.keymap.set('c', '<C-a>', '<Home>')
|
vim.keymap.set("c", "<C-a>", "<Home>")
|
||||||
vim.keymap.set('c', '<C-e>', '<End>')
|
vim.keymap.set("c", "<C-e>", "<End>")
|
||||||
vim.keymap.set('c', '<C-d>', '<Delete>')
|
vim.keymap.set("c", "<C-d>", "<Delete>")
|
||||||
vim.keymap.set('c', '<C-n>', '<Down>')
|
vim.keymap.set("c", "<C-n>", "<Down>")
|
||||||
vim.keymap.set('c', '<C-p>', '<Up>')
|
vim.keymap.set("c", "<C-p>", "<Up>")
|
||||||
vim.keymap.set('c', '<M-f>', '<C-Right>')
|
vim.keymap.set("c", "<M-f>", "<C-Right>")
|
||||||
vim.keymap.set('c', '<M-b>', '<C-Left>')
|
vim.keymap.set("c", "<M-b>", "<C-Left>")
|
||||||
vim.keymap.set('c', '<M-d>', '<C-Right><C-w>')
|
vim.keymap.set("c", "<M-d>", "<C-Right><C-w>")
|
||||||
vim.keymap.set('c', '<M-BS>', '<C-w>')
|
vim.keymap.set("c", "<M-BS>", "<C-w>")
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>ve', function()
|
vim.keymap.set("n", "<leader>ve", function()
|
||||||
if vim.o.virtualedit == 'all' then
|
if vim.o.virtualedit == "all" then
|
||||||
vim.o.virtualedit = 'block'
|
vim.o.virtualedit = "block"
|
||||||
else
|
else
|
||||||
vim.o.virtualedit = 'all'
|
vim.o.virtualedit = "all"
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
@@ -110,7 +110,7 @@ vim.keymap.set("n", "<Leader>r", function()
|
|||||||
end)
|
end)
|
||||||
|
|
||||||
-- Removed bindings
|
-- Removed bindings
|
||||||
vim.keymap.set('n', 'gr', '<Nop>')
|
vim.keymap.set("n", "gr", "<Nop>")
|
||||||
|
|
||||||
-- Default bindings that are good to know:
|
-- Default bindings that are good to know:
|
||||||
-- insert mode:
|
-- insert mode:
|
||||||
|
|||||||
+19
-10
@@ -34,7 +34,7 @@ vim.opt.completeopt:append({
|
|||||||
"noselect",
|
"noselect",
|
||||||
})
|
})
|
||||||
-- set nowrap
|
-- set nowrap
|
||||||
vim.opt.matchpairs:append({ "<:>", })
|
vim.opt.matchpairs:append({ "<:>" })
|
||||||
-- Only relevant with wrap enabled (default)
|
-- Only relevant with wrap enabled (default)
|
||||||
vim.opt.linebreak = true
|
vim.opt.linebreak = true
|
||||||
vim.opt.breakindent = true
|
vim.opt.breakindent = true
|
||||||
@@ -65,7 +65,7 @@ vim.opt.diffopt:append("closeoff")
|
|||||||
vim.opt.diffopt:append("internal")
|
vim.opt.diffopt:append("internal")
|
||||||
-- These make diffs easier to read, please see the following:
|
-- These make diffs easier to read, please see the following:
|
||||||
-- https://vimways.org/2018/the-power-of-diff/
|
-- https://vimways.org/2018/the-power-of-diff/
|
||||||
vim.opt.diffopt:append({ "indent-heuristic", "algorithm:histogram", })
|
vim.opt.diffopt:append({ "indent-heuristic", "algorithm:histogram" })
|
||||||
vim.opt.diffopt:append("linematch:40")
|
vim.opt.diffopt:append("linematch:40")
|
||||||
vim.opt.hlsearch = true
|
vim.opt.hlsearch = true
|
||||||
vim.opt.laststatus = 2
|
vim.opt.laststatus = 2
|
||||||
@@ -75,7 +75,7 @@ vim.opt.shortmess:append("a")
|
|||||||
vim.opt.autoread = true
|
vim.opt.autoread = true
|
||||||
-- vim.opt.cmdheight = 0 -- To hide cmdline when not used. Disabled due to
|
-- vim.opt.cmdheight = 0 -- To hide cmdline when not used. Disabled due to
|
||||||
-- causing "Press ENTER to continue" messages for small messages.
|
-- causing "Press ENTER to continue" messages for small messages.
|
||||||
vim.opt.jumpoptions = {'stack', 'view', 'clean'}
|
vim.opt.jumpoptions = { "stack", "view", "clean" }
|
||||||
vim.opt.updatetime = 100
|
vim.opt.updatetime = 100
|
||||||
vim.opt.guicursor:append("a:Cursor")
|
vim.opt.guicursor:append("a:Cursor")
|
||||||
|
|
||||||
@@ -83,7 +83,7 @@ function _G._status_line_git()
|
|||||||
local status = vim.b.gitsigns_status_dict
|
local status = vim.b.gitsigns_status_dict
|
||||||
|
|
||||||
if not status then
|
if not status then
|
||||||
return ''
|
return ""
|
||||||
end
|
end
|
||||||
|
|
||||||
local added = status.added or 0
|
local added = status.added or 0
|
||||||
@@ -93,15 +93,24 @@ function _G._status_line_git()
|
|||||||
local parts = {}
|
local parts = {}
|
||||||
|
|
||||||
if added > 0 then
|
if added > 0 then
|
||||||
table.insert(parts, string.format("%%#GitSignsAdd#+%d%%*", status.added))
|
table.insert(
|
||||||
|
parts,
|
||||||
|
string.format("%%#GitSignsAdd#+%d%%*", status.added)
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
if changed > 0 then
|
if changed > 0 then
|
||||||
table.insert(parts, string.format('%%#GitSignsChange#~%d%%*', status.changed))
|
table.insert(
|
||||||
|
parts,
|
||||||
|
string.format("%%#GitSignsChange#~%d%%*", status.changed)
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
if removed > 0 then
|
if removed > 0 then
|
||||||
table.insert(parts, string.format('%%#GitSignsDelete#-%d%%*', status.removed))
|
table.insert(
|
||||||
|
parts,
|
||||||
|
string.format("%%#GitSignsDelete#-%d%%*", status.removed)
|
||||||
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
return table.concat(parts, " ")
|
return table.concat(parts, " ")
|
||||||
@@ -120,15 +129,15 @@ function _G._status_line_diagnostics()
|
|||||||
end
|
end
|
||||||
|
|
||||||
if warn > 0 then
|
if warn > 0 then
|
||||||
table.insert(parts, string.format('%%#DiagnosticWarn#W%d%%*', warn))
|
table.insert(parts, string.format("%%#DiagnosticWarn#W%d%%*", warn))
|
||||||
end
|
end
|
||||||
|
|
||||||
if hint > 0 then
|
if hint > 0 then
|
||||||
table.insert(parts, string.format('%%#DiagnosticHint#H%d%%*', hint))
|
table.insert(parts, string.format("%%#DiagnosticHint#H%d%%*", hint))
|
||||||
end
|
end
|
||||||
|
|
||||||
if info > 0 then
|
if info > 0 then
|
||||||
table.insert(parts, string.format('%%#DiagnosticInfo#I%d%%*', info))
|
table.insert(parts, string.format("%%#DiagnosticInfo#I%d%%*", info))
|
||||||
end
|
end
|
||||||
|
|
||||||
return table.concat(parts, " ")
|
return table.concat(parts, " ")
|
||||||
|
|||||||
+4
-17
@@ -4,41 +4,28 @@ local M = {}
|
|||||||
---@param fmt string
|
---@param fmt string
|
||||||
---@param ... any
|
---@param ... any
|
||||||
function M.error(fmt, ...)
|
function M.error(fmt, ...)
|
||||||
vim.notify(
|
vim.notify(fmt:format(...), vim.log.levels.ERROR)
|
||||||
fmt:format(...),
|
|
||||||
vim.log.levels.ERROR
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Log warning message
|
--- Log warning message
|
||||||
---@param fmt string
|
---@param fmt string
|
||||||
---@param ... any
|
---@param ... any
|
||||||
function M.warning(fmt, ...)
|
function M.warning(fmt, ...)
|
||||||
vim.notify(
|
vim.notify(fmt:format(...), vim.log.levels.WARN)
|
||||||
fmt:format(...),
|
|
||||||
vim.log.levels.WARN
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Log info message
|
--- Log info message
|
||||||
---@param fmt string
|
---@param fmt string
|
||||||
---@param ... any
|
---@param ... any
|
||||||
function M.info(fmt, ...)
|
function M.info(fmt, ...)
|
||||||
vim.notify(
|
vim.notify(fmt:format(...), vim.log.levels.INFO)
|
||||||
fmt:format(...),
|
|
||||||
vim.log.levels.INFO
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Log debug message
|
--- Log debug message
|
||||||
---@param fmt string
|
---@param fmt string
|
||||||
---@param ... any
|
---@param ... any
|
||||||
function M.debug(fmt, ...)
|
function M.debug(fmt, ...)
|
||||||
vim.notify(
|
vim.notify(fmt:format(...), vim.log.levels.DEBUG)
|
||||||
fmt:format(...),
|
|
||||||
vim.log.levels.DEBUG
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,10 @@ function M.set_defaults(bufnr)
|
|||||||
mode = { "n", "i" },
|
mode = { "n", "i" },
|
||||||
lhs = "<C-j>",
|
lhs = "<C-j>",
|
||||||
rhs = function()
|
rhs = function()
|
||||||
vim.lsp.buf.signature_help({ border = "rounded", max_width = 80 })
|
vim.lsp.buf.signature_help({
|
||||||
|
border = "rounded",
|
||||||
|
max_width = 80,
|
||||||
|
})
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -86,7 +89,7 @@ function M.set_defaults(bufnr)
|
|||||||
if telescope then
|
if telescope then
|
||||||
vim.list_extend(keymaps, {
|
vim.list_extend(keymaps, {
|
||||||
{ mode = "n", lhs = "<leader>dl", rhs = telescope.diagnostics },
|
{ mode = "n", lhs = "<leader>dl", rhs = telescope.diagnostics },
|
||||||
{ mode = "n", lhs = "grt", rhs = telescope.lsp_type_definitions, },
|
{ mode = "n", lhs = "grt", rhs = telescope.lsp_type_definitions },
|
||||||
{ mode = "n", lhs = "gd", rhs = telescope.lsp_definitions },
|
{ mode = "n", lhs = "gd", rhs = telescope.lsp_definitions },
|
||||||
{ mode = "n", lhs = "gri", rhs = telescope.lsp_implementations },
|
{ mode = "n", lhs = "gri", rhs = telescope.lsp_implementations },
|
||||||
{ mode = "n", lhs = "grr", rhs = telescope.lsp_references },
|
{ mode = "n", lhs = "grr", rhs = telescope.lsp_references },
|
||||||
@@ -94,7 +97,7 @@ function M.set_defaults(bufnr)
|
|||||||
else
|
else
|
||||||
vim.list_extend(keymaps, {
|
vim.list_extend(keymaps, {
|
||||||
{ mode = "n", lhs = "<leader>dl", rhs = vim.diagnostic.setloclist },
|
{ mode = "n", lhs = "<leader>dl", rhs = vim.diagnostic.setloclist },
|
||||||
{ mode = "n", lhs = "grt", rhs = vim.lsp.buf.type_definition, },
|
{ mode = "n", lhs = "grt", rhs = vim.lsp.buf.type_definition },
|
||||||
{ mode = "n", lhs = "gd", rhs = vim.lsp.buf.definition },
|
{ mode = "n", lhs = "gd", rhs = vim.lsp.buf.definition },
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|||||||
+15
-3
@@ -2450,7 +2450,13 @@ uv_udp_t.getpeername = uv.udp_getpeername
|
|||||||
---@param interface_addr string|nil
|
---@param interface_addr string|nil
|
||||||
---@param membership uv.aliases.udp_membership
|
---@param membership uv.aliases.udp_membership
|
||||||
---@return 0|nil success, string? err_name, string? err_msg
|
---@return 0|nil success, string? err_name, string? err_msg
|
||||||
function uv.udp_set_membership(udp, multicast_addr, interface_addr, membership) end
|
function uv.udp_set_membership(
|
||||||
|
udp,
|
||||||
|
multicast_addr,
|
||||||
|
interface_addr,
|
||||||
|
membership
|
||||||
|
)
|
||||||
|
end
|
||||||
uv_udp_t.set_membership = uv.udp_set_membership
|
uv_udp_t.set_membership = uv.udp_set_membership
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -2464,7 +2470,14 @@ uv_udp_t.set_membership = uv.udp_set_membership
|
|||||||
---@param source_addr string
|
---@param source_addr string
|
||||||
---@param membership uv.aliases.udp_membership
|
---@param membership uv.aliases.udp_membership
|
||||||
---@return 0|nil success, string? err_name, string? err_msg
|
---@return 0|nil success, string? err_name, string? err_msg
|
||||||
function uv.udp_set_source_membership(udp, multicast_addr, interface_addr, source_addr, membership) end
|
function uv.udp_set_source_membership(
|
||||||
|
udp,
|
||||||
|
multicast_addr,
|
||||||
|
interface_addr,
|
||||||
|
source_addr,
|
||||||
|
membership
|
||||||
|
)
|
||||||
|
end
|
||||||
uv_udp_t.set_source_membership = uv.udp_set_source_membership
|
uv_udp_t.set_source_membership = uv.udp_set_source_membership
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -4141,4 +4154,3 @@ function uv.metrics_idle_time() end
|
|||||||
uv.constants = {}
|
uv.constants = {}
|
||||||
|
|
||||||
return uv
|
return uv
|
||||||
|
|
||||||
|
|||||||
@@ -76,7 +76,11 @@ return {
|
|||||||
type = "gdb",
|
type = "gdb",
|
||||||
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}",
|
||||||
stopAtBeginningOfMainSubprogram = false,
|
stopAtBeginningOfMainSubprogram = false,
|
||||||
|
|||||||
+31
-27
@@ -10,50 +10,54 @@ return {
|
|||||||
},
|
},
|
||||||
on_attach = function(bufnr)
|
on_attach = function(bufnr)
|
||||||
local gs = package.loaded.gitsigns
|
local gs = package.loaded.gitsigns
|
||||||
vim.keymap.set("n", "<leader>gv", gs.select_hunk, { buffer = bufnr })
|
|
||||||
vim.keymap.set("n", "<leader>gs", gs.stage_hunk, { buffer = bufnr })
|
|
||||||
vim.keymap.set(
|
|
||||||
"x",
|
|
||||||
"<leader>gs",
|
|
||||||
function()
|
|
||||||
gs.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
|
|
||||||
end,
|
|
||||||
{ buffer = bufnr }
|
|
||||||
)
|
|
||||||
vim.keymap.set({ "n", "x" }, "<leader>gu", gs.undo_stage_hunk, { buffer = bufnr })
|
|
||||||
vim.keymap.set("n", "<leader>gr", gs.reset_hunk, { buffer = bufnr })
|
|
||||||
vim.keymap.set("x", "<leader>gr", ":Gitsigns reset_hunk<CR>", { buffer = bufnr })
|
|
||||||
vim.keymap.set("n", "<leader>g?", gs.preview_hunk, { buffer = bufnr })
|
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
"n",
|
"n",
|
||||||
"<leader>gb",
|
"<leader>gv",
|
||||||
function()
|
gs.select_hunk,
|
||||||
gs.blame_line { full = true, ignore_whitespace = true }
|
{ buffer = bufnr }
|
||||||
end,
|
)
|
||||||
|
vim.keymap.set("n", "<leader>gs", gs.stage_hunk, { buffer = bufnr })
|
||||||
|
vim.keymap.set("x", "<leader>gs", function()
|
||||||
|
gs.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
|
||||||
|
end, { buffer = bufnr })
|
||||||
|
vim.keymap.set(
|
||||||
|
{ "n", "x" },
|
||||||
|
"<leader>gu",
|
||||||
|
gs.undo_stage_hunk,
|
||||||
|
{ buffer = bufnr }
|
||||||
|
)
|
||||||
|
vim.keymap.set("n", "<leader>gr", gs.reset_hunk, { buffer = bufnr })
|
||||||
|
vim.keymap.set(
|
||||||
|
"x",
|
||||||
|
"<leader>gr",
|
||||||
|
":Gitsigns reset_hunk<CR>",
|
||||||
{ buffer = bufnr }
|
{ buffer = bufnr }
|
||||||
)
|
)
|
||||||
vim.keymap.set(
|
vim.keymap.set(
|
||||||
{ "n", "x" },
|
"n",
|
||||||
"]g", function()
|
"<leader>g?",
|
||||||
|
gs.preview_hunk,
|
||||||
|
{ buffer = bufnr }
|
||||||
|
)
|
||||||
|
vim.keymap.set("n", "<leader>gb", function()
|
||||||
|
gs.blame_line({ full = true, ignore_whitespace = true })
|
||||||
|
end, { buffer = bufnr })
|
||||||
|
vim.keymap.set({ "n", "x" }, "]g", function()
|
||||||
gs.next_hunk({
|
gs.next_hunk({
|
||||||
wrap = true,
|
wrap = true,
|
||||||
navigation_message = true,
|
navigation_message = true,
|
||||||
foldopen = true,
|
foldopen = true,
|
||||||
preview = true,
|
preview = true,
|
||||||
})
|
})
|
||||||
end
|
end)
|
||||||
)
|
vim.keymap.set({ "n", "x" }, "[g", function()
|
||||||
vim.keymap.set(
|
|
||||||
{ "n", "x" },
|
|
||||||
"[g", function()
|
|
||||||
gs.prev_hunk({
|
gs.prev_hunk({
|
||||||
wrap = true,
|
wrap = true,
|
||||||
navigation_message = true,
|
navigation_message = true,
|
||||||
foldopen = true,
|
foldopen = true,
|
||||||
preview = true,
|
preview = true,
|
||||||
})
|
})
|
||||||
end
|
end)
|
||||||
)
|
|
||||||
end,
|
end,
|
||||||
attach_to_untracked = true,
|
attach_to_untracked = true,
|
||||||
sign_priority = 100,
|
sign_priority = 100,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
return {
|
return {
|
||||||
"nvim-treesitter/nvim-treesitter-context",
|
"nvim-treesitter/nvim-treesitter-context",
|
||||||
opts = {
|
opts = {
|
||||||
mode = 'topline',
|
mode = "topline",
|
||||||
max_lines = 3,
|
max_lines = 3,
|
||||||
multiline_threshold = 1,
|
multiline_threshold = 1,
|
||||||
multiwindow = true,
|
multiwindow = true,
|
||||||
|
|||||||
@@ -31,6 +31,5 @@ return {
|
|||||||
org_agenda_span = "week",
|
org_agenda_span = "week",
|
||||||
org_agenda_skip_scheduled_if_done = true,
|
org_agenda_skip_scheduled_if_done = true,
|
||||||
org_agenda_skip_deadline_if_done = true,
|
org_agenda_skip_deadline_if_done = true,
|
||||||
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ return {
|
|||||||
},
|
},
|
||||||
file_ignore_patterns = {
|
file_ignore_patterns = {
|
||||||
"^%.git/",
|
"^%.git/",
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
extensions = {
|
extensions = {
|
||||||
undo = {
|
undo = {
|
||||||
|
|||||||
Reference in New Issue
Block a user