Update 21.07.23
This commit is contained in:
parent
29a0d2ee30
commit
25bc8e05c4
11
after/syntax/diff.vim
Normal file
11
after/syntax/diff.vim
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
" hi DiffAdd gui=none guifg=NONE guibg=#bada9f
|
||||||
|
" hi DiffChange gui=none guifg=NONE guibg=#e5d5ac
|
||||||
|
" hi DiffDelete gui=bold guifg=#ff8080 guibg=#ffb0b0
|
||||||
|
" hi DiffText gui=none guifg=NONE guibg=#8cbee2
|
||||||
|
hi DiffAdd gui=none guifg=NONE guibg=#003200
|
||||||
|
hi DiffChange gui=none guifg=NONE guibg=#000032
|
||||||
|
hi DiffDelete gui=bold guifg=#ff8080 guibg=#602020
|
||||||
|
hi DiffText gui=bold guifg=NONE guibg=#102040
|
||||||
|
hi link @text.diff.add DiffAdd
|
||||||
|
hi link @text.diff.delete DiffDelete
|
||||||
|
hi link @text.diff.change DiffChange
|
||||||
@ -30,6 +30,7 @@ M.general = {
|
|||||||
["<C-A-d>"] = { "<cmd> DiffviewClose<CR>", "Close git diff" },
|
["<C-A-d>"] = { "<cmd> DiffviewClose<CR>", "Close git diff" },
|
||||||
-- ["<C-p>"] = { "<cmd> tab Git diff<CR>", "Git diff global" },
|
-- ["<C-p>"] = { "<cmd> tab Git diff<CR>", "Git diff global" },
|
||||||
["<C-p>"] = { "<cmd> DiffviewOpen<CR>", "Git diff global" },
|
["<C-p>"] = { "<cmd> DiffviewOpen<CR>", "Git diff global" },
|
||||||
|
["<A-p>"] = { ":DiffviewOpen HEAD~", "Show last N commits" },
|
||||||
["<leader>gd"] = { "<cmd> DiffviewClose<CR>", "Git diff close" },
|
["<leader>gd"] = { "<cmd> DiffviewClose<CR>", "Git diff close" },
|
||||||
|
|
||||||
-- save
|
-- save
|
||||||
@ -96,6 +97,8 @@ M.customstuffs = {
|
|||||||
["<leader>gp"] = { "<cmd> Git pull<CR>", "Git pull" },
|
["<leader>gp"] = { "<cmd> Git pull<CR>", "Git pull" },
|
||||||
["<leader>gnb"] = { ":Git checkout -b ", "Checkout to a new branch" },
|
["<leader>gnb"] = { ":Git checkout -b ", "Checkout to a new branch" },
|
||||||
["<leader>gri"] = { ":Git rebase -i HEAD~", "Git rebase interactive from HEAD" },
|
["<leader>gri"] = { ":Git rebase -i HEAD~", "Git rebase interactive from HEAD" },
|
||||||
|
["<leader>mkd"] = { "<cmd>lua vim.api.nvim_create_user_command('PeekOpen', require('peek').open, {})<CR>", "Open markdown preview" },
|
||||||
|
["<leader>mkc"] = { "<cmd>lua vim.api.nvim_create_user_command('PeekClose', require('peek').close, {})<CR>", "Open markdown preview" },
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -293,6 +296,8 @@ M.telescope = {
|
|||||||
plugin = true,
|
plugin = true,
|
||||||
|
|
||||||
n = {
|
n = {
|
||||||
|
-- Resume
|
||||||
|
["<A-f>"] = { "<cmd> Telescope resume <CR>", "Resume" },
|
||||||
-- find
|
-- find
|
||||||
["<C-g>"] = { "<cmd> Telescope find_files <CR>", "Find files" },
|
["<C-g>"] = { "<cmd> Telescope find_files <CR>", "Find files" },
|
||||||
["<C-x>"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "Find all" },
|
["<C-x>"] = { "<cmd> Telescope find_files follow=true no_ignore=true hidden=true <CR>", "Find all" },
|
||||||
|
|||||||
@ -3,6 +3,16 @@
|
|||||||
local default_plugins = {
|
local default_plugins = {
|
||||||
|
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
|
"rebelot/kanagawa.nvim",
|
||||||
|
{
|
||||||
|
"iamcco/markdown-preview.nvim",
|
||||||
|
run = "cd app && npm install",
|
||||||
|
lazy = false,
|
||||||
|
setup = function()
|
||||||
|
vim.g.mkdp_filetypes = { "markdown" }
|
||||||
|
end,
|
||||||
|
ft = { "markdown" },
|
||||||
|
},
|
||||||
{"tpope/vim-fugitive", lazy=false},
|
{"tpope/vim-fugitive", lazy=false},
|
||||||
{"rbong/vim-flog", lazy=false},
|
{"rbong/vim-flog", lazy=false},
|
||||||
{"tpope/vim-surround", lazy=false},
|
{"tpope/vim-surround", lazy=false},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user