nvim: reorganization and add due: plugin
This commit is contained in:
parent
fe60cfe775
commit
680295eeed
2 changed files with 31 additions and 8 deletions
|
@ -97,24 +97,21 @@ M.gitsigns = function()
|
||||||
keymaps = {
|
keymaps = {
|
||||||
-- Default keymap options
|
-- Default keymap options
|
||||||
noremap = true,
|
noremap = true,
|
||||||
|
|
||||||
['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'"},
|
['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns.actions\".next_hunk()<CR>'"},
|
||||||
['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"},
|
['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns.actions\".prev_hunk()<CR>'"},
|
||||||
|
-- hunk binds
|
||||||
['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
|
['n <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
|
||||||
|
['v <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
|
||||||
['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
|
['n <leader>hu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
|
||||||
['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
|
['n <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
|
||||||
|
|
||||||
['v <leader>hs'] = '<cmd>lua require"gitsigns".stage_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
|
|
||||||
['v <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
|
['v <leader>hr'] = '<cmd>lua require"gitsigns".reset_hunk({vim.fn.line("."), vim.fn.line("v")})<CR>',
|
||||||
|
|
||||||
['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
|
['n <leader>hp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
|
||||||
['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>',
|
-- buffer binds
|
||||||
|
|
||||||
['n <leader>hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
|
['n <leader>hS'] = '<cmd>lua require"gitsigns".stage_buffer()<CR>',
|
||||||
['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
|
['n <leader>hR'] = '<cmd>lua require"gitsigns".reset_buffer()<CR>',
|
||||||
['n <leader>hU'] = '<cmd>lua require"gitsigns".reset_buffer_index()<CR>',
|
['n <leader>hU'] = '<cmd>lua require"gitsigns".reset_buffer_index()<CR>',
|
||||||
|
-- misc.
|
||||||
|
['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line(true)<CR>',
|
||||||
-- Text objects
|
-- Text objects
|
||||||
['o ih'] = '<cmd><C-U>lua require"gitsigns.actions".select_hunk()<CR>',
|
['o ih'] = '<cmd><C-U>lua require"gitsigns.actions".select_hunk()<CR>',
|
||||||
['x ih'] = '<cmd><C-U>lua require"gitsigns.actions".select_hunk()<CR>'
|
['x ih'] = '<cmd><C-U>lua require"gitsigns.actions".select_hunk()<CR>'
|
||||||
|
@ -189,6 +186,26 @@ M.autosession = function()
|
||||||
vim.cmd 'command! SessionRestore RestoreSession'
|
vim.cmd 'command! SessionRestore RestoreSession'
|
||||||
end -- <<<
|
end -- <<<
|
||||||
|
|
||||||
|
-- due: TODAY >>>
|
||||||
|
M.due = function()
|
||||||
|
require('due_nvim').setup {
|
||||||
|
prescript = 'due: ', -- prescript to due data
|
||||||
|
prescript_hi = 'Comment', -- highlight group of it
|
||||||
|
due_hi = 'String', -- highlight group of the data itself
|
||||||
|
ft = '*.sh', -- filename template to apply aucmds :)
|
||||||
|
today = 'TODAY', -- text for today's due
|
||||||
|
today_hi = 'Character', -- highlight group of today's due
|
||||||
|
overdue = 'OVERDUE', -- text for overdued
|
||||||
|
overdue_hi = 'Error', -- highlight group of overdued
|
||||||
|
date_hi = 'Conceal', -- highlight group of date string
|
||||||
|
pattern_start = '<', -- start for a date string pattern
|
||||||
|
pattern_end = '>', -- end for a date string pattern
|
||||||
|
use_clock_time = false, -- allow due.nvim to calculate hours, minutes, and seconds
|
||||||
|
default_due_time = "midnight", -- if use_clock_time == true, calculate time until option on specified date.
|
||||||
|
-- ^ Accepts "midnight", for 23:59:59, or noon, for 12:00:00
|
||||||
|
}
|
||||||
|
end -- <<<
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
||||||
-- vim:fdm=marker:fmr=>>>,<<<:expandtab:tabstop=3:sw=3
|
-- vim:fdm=marker:fmr=>>>,<<<:expandtab:tabstop=3:sw=3
|
||||||
|
|
|
@ -183,6 +183,12 @@ return require('packer').startup(function()
|
||||||
use { -- tpope: Repeatability for various tpope plugins
|
use { -- tpope: Repeatability for various tpope plugins
|
||||||
'tpope/vim-repeat',
|
'tpope/vim-repeat',
|
||||||
}
|
}
|
||||||
|
use { -- displays 'due: 2d 5h 3m' if there is a date (<12-25>) on the line
|
||||||
|
'NFrid/due.nvim',
|
||||||
|
config = function()
|
||||||
|
require('blake.other').due()
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue