gitconfig difft + nvim unlisted buffers fix & noice messages
This commit is contained in:
+35
-5
@@ -11,7 +11,7 @@
|
||||
cpld = loadcheckpoint required = true
|
||||
[core]
|
||||
filemode = false
|
||||
pager = delta
|
||||
pager = delta --diff-so-fancy
|
||||
autorcrlf = true
|
||||
editor = nvim
|
||||
[user]
|
||||
@@ -23,12 +23,42 @@
|
||||
process = git-lfs filter-process
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
[diff]
|
||||
external = difft
|
||||
colorMoved = default
|
||||
[delta]
|
||||
navigate = true
|
||||
light = false
|
||||
line-numbers = true
|
||||
side-by-side = true
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
[diff]
|
||||
colorMoved = default
|
||||
features = decorations
|
||||
minus-style = bold red
|
||||
minus-non-emph-style = bold red
|
||||
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 = {
|
||||
pyright = {
|
||||
python = {
|
||||
analysis = {
|
||||
diagnosticMode = "workspace",
|
||||
logLevel = "Warning",
|
||||
typeCheckingMode = "basic",
|
||||
autoImportCompletions = false,
|
||||
venvPath = ".",
|
||||
},
|
||||
analysis = { typeCheckingMode = "standard" },
|
||||
},
|
||||
},
|
||||
lua_ls = {
|
||||
@@ -807,6 +801,7 @@ require("lazy").setup({
|
||||
["vim.lsp.util.stylize_markdown"] = true,
|
||||
["cmp.entry.get_documentation"] = true,
|
||||
},
|
||||
progress = { enabled = false },
|
||||
},
|
||||
-- you can enable a preset for easier configuration
|
||||
presets = {
|
||||
@@ -817,6 +812,23 @@ require("lazy").setup({
|
||||
lsp_doc_border = false, -- add a border to hover docs and signature help
|
||||
},
|
||||
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,
|
||||
dependencies = { "MunifTanjim/nui.nvim" },
|
||||
@@ -837,7 +849,7 @@ vim.g.BASH_Ctrl_l = "off"
|
||||
-- TODO remove <cr> in commands
|
||||
|
||||
-- colors
|
||||
vim.cmd("colorscheme minicyan")
|
||||
vim.cmd("colorscheme ayu-mirage")
|
||||
-- undo
|
||||
vim.o.undolevels = 100000
|
||||
vim.o.undoreload = 100000
|
||||
@@ -915,6 +927,7 @@ map("", "<F12>", "<esc>", { silent = true, noremap = true })
|
||||
-- <Tab> to navigate the completion menu
|
||||
map("i", "<S-Tab>", [[pumvisible() ? "\<C-p>" : "\<S-Tab>"]], { expr = true, noremap = true })
|
||||
map("i", "<Tab>", [[pumvisible() ? "\<C-n>" : "\<Tab>"]], { expr = true, noremap = true })
|
||||
vim.opt.pumheight = 0
|
||||
|
||||
-- CURSOR
|
||||
-- stay visual when indenting
|
||||
|
||||
Reference in New Issue
Block a user