diff --git a/HOME/.gitconfig b/HOME/.gitconfig index b9c8949..27c116e 100644 --- a/HOME/.gitconfig +++ b/HOME/.gitconfig @@ -1,34 +1,64 @@ [alias] - save = "!f() { git add -u && git commit --no-verify -m "\"SAVEPOINT - $@\""; }; f" - 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" - checkpoints = tag -l "checkpoint/*" - delcheckpoint = "!f() { git tag -d checkpoint/$1; }; f" - loadcheckpoint = "!f() { git reset --hard checkpoint/$1 && git undo; }; f" - cp = checkpoint - cpls = loadcheckpoint - cpd = delcheckpoint - cpld = loadcheckpoint required = true + save = "!f() { git add -u && git commit --no-verify -m "\"SAVEPOINT - $@\""; }; f" + 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" + checkpoints = tag -l "checkpoint/*" + delcheckpoint = "!f() { git tag -d checkpoint/$1; }; f" + loadcheckpoint = "!f() { git reset --hard checkpoint/$1 && git undo; }; f" + cp = checkpoint + cpls = loadcheckpoint + cpd = delcheckpoint + cpld = loadcheckpoint required = true [core] - filemode = false - pager = delta - autorcrlf = true - editor = nvim + filemode = false + pager = delta --diff-so-fancy + autorcrlf = true + editor = nvim [user] - name = Henrik Bakken - email = bakken.henrik@gmail.com + name = Henrik Bakken + email = bakken.henrik@gmail.com [filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + 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 diff --git a/nvim/init.lua b/nvim/init.lua index 9258bbc..1022585 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -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 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("", "", "", { silent = true, noremap = true }) -- to navigate the completion menu map("i", "", [[pumvisible() ? "\" : "\"]], { expr = true, noremap = true }) map("i", "", [[pumvisible() ? "\" : "\"]], { expr = true, noremap = true }) +vim.opt.pumheight = 0 -- CURSOR -- stay visual when indenting