gitconfig difft + nvim unlisted buffers fix & noice messages
This commit is contained in:
+53
-23
@@ -1,34 +1,64 @@
|
|||||||
[alias]
|
[alias]
|
||||||
save = "!f() { git add -u && git commit --no-verify -m "\"SAVEPOINT - $@\""; }; f"
|
save = "!f() { git add -u && git commit --no-verify -m "\"SAVEPOINT - $@\""; }; f"
|
||||||
undo = reset HEAD~1 --mixed
|
undo = reset HEAD~1 --mixed
|
||||||
checkpoint = "!f() { git save ${1-CHECKPOINT}; git tag "\"checkpoint/${1-`date +%Y%m%d_%H%M%S`}\""; git undo; }; f"
|
checkpoint = "!f() { git save ${1-CHECKPOINT}; git tag "\"checkpoint/${1-`date +%Y%m%d_%H%M%S`}\""; git undo; }; f"
|
||||||
checkpoints = tag -l "checkpoint/*"
|
checkpoints = tag -l "checkpoint/*"
|
||||||
delcheckpoint = "!f() { git tag -d checkpoint/$1; }; f"
|
delcheckpoint = "!f() { git tag -d checkpoint/$1; }; f"
|
||||||
loadcheckpoint = "!f() { git reset --hard checkpoint/$1 && git undo; }; f"
|
loadcheckpoint = "!f() { git reset --hard checkpoint/$1 && git undo; }; f"
|
||||||
cp = checkpoint
|
cp = checkpoint
|
||||||
cpls = loadcheckpoint
|
cpls = loadcheckpoint
|
||||||
cpd = delcheckpoint
|
cpd = delcheckpoint
|
||||||
cpld = loadcheckpoint required = true
|
cpld = loadcheckpoint required = true
|
||||||
[core]
|
[core]
|
||||||
filemode = false
|
filemode = false
|
||||||
pager = delta
|
pager = delta --diff-so-fancy
|
||||||
autorcrlf = true
|
autorcrlf = true
|
||||||
editor = nvim
|
editor = nvim
|
||||||
[user]
|
[user]
|
||||||
name = Henrik Bakken
|
name = Henrik Bakken
|
||||||
email = bakken.henrik@gmail.com
|
email = bakken.henrik@gmail.com
|
||||||
[filter "lfs"]
|
[filter "lfs"]
|
||||||
clean = git-lfs clean -- %f
|
clean = git-lfs clean -- %f
|
||||||
smudge = git-lfs smudge -- %f
|
smudge = git-lfs smudge -- %f
|
||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
[interactive]
|
[interactive]
|
||||||
diffFilter = delta --color-only
|
diffFilter = delta --color-only
|
||||||
|
[merge]
|
||||||
|
conflictstyle = diff3
|
||||||
|
[diff]
|
||||||
|
external = difft
|
||||||
|
colorMoved = default
|
||||||
[delta]
|
[delta]
|
||||||
navigate = true
|
navigate = true
|
||||||
light = false
|
light = false
|
||||||
line-numbers = true
|
line-numbers = true
|
||||||
side-by-side = true
|
side-by-side = true
|
||||||
[merge]
|
features = decorations
|
||||||
conflictstyle = diff3
|
minus-style = bold red
|
||||||
[diff]
|
minus-non-emph-style = bold red
|
||||||
colorMoved = default
|
minus-emph-style = bold reverse red
|
||||||
|
minus-empty-line-marker-style = normal "#3f0001"
|
||||||
|
plus-style = bold green
|
||||||
|
plus-non-emph-style = bold green
|
||||||
|
plus-emph-style = bold reverse green
|
||||||
|
[delta "interactive"]
|
||||||
|
keep-plus-minus-markers = false[delta "decorations"]
|
||||||
|
commit-decoration-style = bold yellow box ul
|
||||||
|
file-style = bold yellow ul
|
||||||
|
file-decoration-style = none
|
||||||
|
hunk-header-decoration-style = cyan box ul
|
||||||
|
[color]
|
||||||
|
ui = true
|
||||||
|
[color "diff-highlight"]
|
||||||
|
oldNormal = red bold
|
||||||
|
oldHighlight = red bold 52
|
||||||
|
newNormal = green bold
|
||||||
|
newHighlight = green bold 22
|
||||||
|
[color "diff"]
|
||||||
|
meta = 11
|
||||||
|
frag = magenta bold
|
||||||
|
func = 146 bold
|
||||||
|
commit = yellow bold
|
||||||
|
old = red bold
|
||||||
|
new = green bold
|
||||||
|
whitespace = red reverse
|
||||||
|
|||||||
+21
-8
@@ -713,13 +713,7 @@ require("lazy").setup({
|
|||||||
local server_configs = {
|
local server_configs = {
|
||||||
pyright = {
|
pyright = {
|
||||||
python = {
|
python = {
|
||||||
analysis = {
|
analysis = { typeCheckingMode = "standard" },
|
||||||
diagnosticMode = "workspace",
|
|
||||||
logLevel = "Warning",
|
|
||||||
typeCheckingMode = "basic",
|
|
||||||
autoImportCompletions = false,
|
|
||||||
venvPath = ".",
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
lua_ls = {
|
lua_ls = {
|
||||||
@@ -807,6 +801,7 @@ require("lazy").setup({
|
|||||||
["vim.lsp.util.stylize_markdown"] = true,
|
["vim.lsp.util.stylize_markdown"] = true,
|
||||||
["cmp.entry.get_documentation"] = true,
|
["cmp.entry.get_documentation"] = true,
|
||||||
},
|
},
|
||||||
|
progress = { enabled = false },
|
||||||
},
|
},
|
||||||
-- you can enable a preset for easier configuration
|
-- you can enable a preset for easier configuration
|
||||||
presets = {
|
presets = {
|
||||||
@@ -817,6 +812,23 @@ require("lazy").setup({
|
|||||||
lsp_doc_border = false, -- add a border to hover docs and signature help
|
lsp_doc_border = false, -- add a border to hover docs and signature help
|
||||||
},
|
},
|
||||||
messages = { enabled = true, view_search = false },
|
messages = { enabled = true, view_search = false },
|
||||||
|
routes = {
|
||||||
|
{
|
||||||
|
filter = {
|
||||||
|
event = "msg_show",
|
||||||
|
kind = "search_count",
|
||||||
|
},
|
||||||
|
opts = { skip = true },
|
||||||
|
},
|
||||||
|
{ -- show 'recording @...'
|
||||||
|
filter = { event = "msg_showmode" },
|
||||||
|
view = "notify",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
filter = { kind = "", min_height = 2 },
|
||||||
|
view = "split",
|
||||||
|
},
|
||||||
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
dependencies = { "MunifTanjim/nui.nvim" },
|
dependencies = { "MunifTanjim/nui.nvim" },
|
||||||
@@ -837,7 +849,7 @@ vim.g.BASH_Ctrl_l = "off"
|
|||||||
-- TODO remove <cr> in commands
|
-- TODO remove <cr> in commands
|
||||||
|
|
||||||
-- colors
|
-- colors
|
||||||
vim.cmd("colorscheme minicyan")
|
vim.cmd("colorscheme ayu-mirage")
|
||||||
-- undo
|
-- undo
|
||||||
vim.o.undolevels = 100000
|
vim.o.undolevels = 100000
|
||||||
vim.o.undoreload = 100000
|
vim.o.undoreload = 100000
|
||||||
@@ -915,6 +927,7 @@ map("", "<F12>", "<esc>", { silent = true, noremap = true })
|
|||||||
-- <Tab> to navigate the completion menu
|
-- <Tab> to navigate the completion menu
|
||||||
map("i", "<S-Tab>", [[pumvisible() ? "\<C-p>" : "\<S-Tab>"]], { expr = true, noremap = true })
|
map("i", "<S-Tab>", [[pumvisible() ? "\<C-p>" : "\<S-Tab>"]], { expr = true, noremap = true })
|
||||||
map("i", "<Tab>", [[pumvisible() ? "\<C-n>" : "\<Tab>"]], { expr = true, noremap = true })
|
map("i", "<Tab>", [[pumvisible() ? "\<C-n>" : "\<Tab>"]], { expr = true, noremap = true })
|
||||||
|
vim.opt.pumheight = 0
|
||||||
|
|
||||||
-- CURSOR
|
-- CURSOR
|
||||||
-- stay visual when indenting
|
-- stay visual when indenting
|
||||||
|
|||||||
Reference in New Issue
Block a user