fix(nvim): format
This commit is contained in:
parent
c759cd0d0e
commit
15edf30ef3
GPG key ID:
A6C96C9349D2FC81
5 changed files with 69 additions and 33 deletions
|
|
@ -77,7 +77,10 @@ M.conventional_commits = make_source({
|
|||
{
|
||||
range = {
|
||||
start = { line = 0, character = colon - 1 },
|
||||
['end'] = { line = 0, character = colon - 1 },
|
||||
['end'] = {
|
||||
line = 0,
|
||||
character = colon - 1,
|
||||
},
|
||||
},
|
||||
newText = '!',
|
||||
},
|
||||
|
|
|
|||
|
|
@ -38,7 +38,10 @@ return {
|
|||
end,
|
||||
sign = function()
|
||||
local marks = vim.api.nvim_buf_get_extmarks(
|
||||
0, -1, { vim.v.lnum - 1, 0 }, { vim.v.lnum - 1, -1 },
|
||||
0,
|
||||
-1,
|
||||
{ vim.v.lnum - 1, 0 },
|
||||
{ vim.v.lnum - 1, -1 },
|
||||
{ details = true, type = 'sign' }
|
||||
)
|
||||
for _, mark in ipairs(marks) do
|
||||
|
|
@ -46,7 +49,10 @@ return {
|
|||
if d and d.sign_text then
|
||||
local text = vim.trim(d.sign_text)
|
||||
if text ~= '' then
|
||||
return '%#' .. (d.sign_hl_group or 'SignColumn') .. '#' .. text
|
||||
return '%#'
|
||||
.. (d.sign_hl_group or 'SignColumn')
|
||||
.. '#'
|
||||
.. text
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ return {
|
|||
opts.files.file_icons = has_devicons
|
||||
opts.grep = opts.grep or {}
|
||||
opts.grep.file_icons = has_devicons
|
||||
opts.grep.rg_opts = fzf.defaults.grep.rg_opts:gsub("%-e$", "--glob='!.git/' -e")
|
||||
opts.grep.rg_opts =
|
||||
fzf.defaults.grep.rg_opts:gsub('%-e$', "--glob='!.git/' -e")
|
||||
|
||||
fzf.setup(opts)
|
||||
|
||||
|
|
@ -45,7 +46,7 @@ return {
|
|||
end
|
||||
end,
|
||||
},
|
||||
{ '<c-l>', '<cmd>FzfLua live_grep<cr>' },
|
||||
{ '<c-l>', '<cmd>FzfLua live_grep<cr>' },
|
||||
{ '<leader>f/', '<cmd>FzfLua search_history<cr>' },
|
||||
{ '<leader>f:', '<cmd>FzfLua command_history<cr>' },
|
||||
{ '<leader>fa', '<cmd>FzfLua autocmds<cr>' },
|
||||
|
|
@ -79,8 +80,8 @@ return {
|
|||
},
|
||||
{ '<leader>gb', '<cmd>FzfLua git_branches<cr>' },
|
||||
{ '<leader>gw', '<cmd>FzfLua git_worktrees<cr>' },
|
||||
{ 'gq', '<cmd>FzfLua quickfix<cr>' },
|
||||
{ 'gl', '<cmd>FzfLua loclist<cr>' },
|
||||
{ 'gq', '<cmd>FzfLua quickfix<cr>' },
|
||||
{ 'gl', '<cmd>FzfLua loclist<cr>' },
|
||||
},
|
||||
opts = {
|
||||
file_icon_padding = ' ',
|
||||
|
|
|
|||
|
|
@ -230,7 +230,9 @@ return {
|
|||
dir = '~/dev/oil-git.nvim',
|
||||
opts = {
|
||||
symbol_position = 'signcolumn',
|
||||
can_use_signcolumn = function() return true end,
|
||||
can_use_signcolumn = function()
|
||||
return true
|
||||
end,
|
||||
show_file_highlights = false,
|
||||
show_directory_highlights = false,
|
||||
symbols = {
|
||||
|
|
@ -268,24 +270,36 @@ return {
|
|||
},
|
||||
},
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
event = "VeryLazy",
|
||||
'lewis6991/gitsigns.nvim',
|
||||
event = 'VeryLazy',
|
||||
opts = {
|
||||
signs = {
|
||||
add = { text = "│" },
|
||||
change = { text = "│" },
|
||||
delete = { text = "＿" },
|
||||
topdelete = { text = "‾" },
|
||||
changedelete = { text = "│" },
|
||||
add = { text = '│' },
|
||||
change = { text = '│' },
|
||||
delete = { text = '＿' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '│' },
|
||||
},
|
||||
on_attach = function(bufnr)
|
||||
vim.wo[vim.fn.bufwinid(bufnr)].signcolumn = 'yes'
|
||||
end,
|
||||
},
|
||||
keys = {
|
||||
{ "]g", "<cmd>Gitsigns next_hunk<cr>", desc = "Next git hunk" },
|
||||
{ "[g", "<cmd>Gitsigns prev_hunk<cr>", desc = "Previous git hunk" },
|
||||
{ "<leader>gB", "<cmd>Gitsigns toggle_current_line_blame<cr>", desc = "Toggle line blame" },
|
||||
{
|
||||
']g',
|
||||
'<cmd>Gitsigns next_hunk<cr>',
|
||||
desc = 'Next git hunk',
|
||||
},
|
||||
{
|
||||
'[g',
|
||||
'<cmd>Gitsigns prev_hunk<cr>',
|
||||
desc = 'Previous git hunk',
|
||||
},
|
||||
{
|
||||
'<leader>gB',
|
||||
'<cmd>Gitsigns toggle_current_line_blame<cr>',
|
||||
desc = 'Toggle line blame',
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,10 @@ local function parse_output(proc)
|
|||
local result = proc:wait()
|
||||
local ret = {}
|
||||
if result.code == 0 then
|
||||
for line in vim.gsplit(result.stdout, "\n", { plain = true, trimempty = true }) do
|
||||
ret[line:gsub("/$", "")] = true
|
||||
for line in
|
||||
vim.gsplit(result.stdout, '\n', { plain = true, trimempty = true })
|
||||
do
|
||||
ret[line:gsub('/$', '')] = true
|
||||
end
|
||||
end
|
||||
return ret
|
||||
|
|
@ -14,12 +16,16 @@ end
|
|||
local function new_git_status()
|
||||
return setmetatable({}, {
|
||||
__index = function(self, key)
|
||||
local ignored_proc = vim.system(
|
||||
{ "git", "ls-files", "--ignored", "--exclude-standard", "--others", "--directory" },
|
||||
{ cwd = key, text = true }
|
||||
)
|
||||
local ignored_proc = vim.system({
|
||||
'git',
|
||||
'ls-files',
|
||||
'--ignored',
|
||||
'--exclude-standard',
|
||||
'--others',
|
||||
'--directory',
|
||||
}, { cwd = key, text = true })
|
||||
local tracked_proc = vim.system(
|
||||
{ "git", "ls-tree", "HEAD", "--name-only" },
|
||||
{ 'git', 'ls-tree', 'HEAD', '--name-only' },
|
||||
{ cwd = key, text = true }
|
||||
)
|
||||
local ret = {
|
||||
|
|
@ -267,7 +273,7 @@ return {
|
|||
dir = '~/dev/oil.nvim',
|
||||
config = function(_, opts)
|
||||
require('oil').setup(opts)
|
||||
local refresh = require("oil.actions").refresh
|
||||
local refresh = require('oil.actions').refresh
|
||||
local orig_refresh = refresh.callback
|
||||
refresh.callback = function(...)
|
||||
git_status = new_git_status()
|
||||
|
|
@ -297,8 +303,9 @@ return {
|
|||
float = { border = 'single' },
|
||||
view_options = {
|
||||
is_hidden_file = function(name, bufnr)
|
||||
local dir = require("oil").get_current_dir(bufnr)
|
||||
local is_dotfile = vim.startswith(name, ".") and name ~= ".."
|
||||
local dir = require('oil').get_current_dir(bufnr)
|
||||
local is_dotfile = vim.startswith(name, '.')
|
||||
and name ~= '..'
|
||||
if not dir then
|
||||
return is_dotfile
|
||||
end
|
||||
|
|
@ -352,17 +359,22 @@ return {
|
|||
},
|
||||
},
|
||||
{ 'tpope/vim-abolish', event = 'VeryLazy' },
|
||||
{ 'tpope/vim-sleuth', event = 'BufReadPost' },
|
||||
{ 'tpope/vim-sleuth', event = 'BufReadPost' },
|
||||
{
|
||||
'kylechui/nvim-surround',
|
||||
config = true,
|
||||
keys = {
|
||||
{ 'cs', mode = 'n' },
|
||||
{ 'ds', mode = 'n' },
|
||||
{ 'ys', mode = 'n' },
|
||||
{ 'yS', mode = 'n' },
|
||||
{ 'cs', mode = 'n' },
|
||||
{ 'ds', mode = 'n' },
|
||||
{ 'ys', mode = 'n' },
|
||||
{ 'yS', mode = 'n' },
|
||||
{ 'yss', mode = 'n' },
|
||||
{ 'ySs', mode = 'n' },
|
||||
},
|
||||
},
|
||||
{
|
||||
'wallpants/github-preview.nvim',
|
||||
keys = { '<leader>m', '<cmd>GithubPreviewToggle<cr>' },
|
||||
config = true,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue