From efbefca6b5c063e60f0b749ef4031f514a1b5963 Mon Sep 17 00:00:00 2001 From: Anton Bilous Date: Tue, 2 Dec 2025 16:54:32 +0200 Subject: [PATCH] git mpv --- .config/fish/functions/fish_user_key_bindings.fish | 14 ++++++++------ .config/git/config | 9 +++++++++ .config/helix/languages.toml | 2 ++ .config/lazygit/config.yml | 3 +-- .config/mpv/mpv.conf | 4 +++- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.config/fish/functions/fish_user_key_bindings.fish b/.config/fish/functions/fish_user_key_bindings.fish index bd80f33..4312766 100644 --- a/.config/fish/functions/fish_user_key_bindings.fish +++ b/.config/fish/functions/fish_user_key_bindings.fish @@ -1,10 +1,12 @@ function fish_user_key_bindings - if command -q fzf; and functions -q fzf_key_bindings - set -gx FZF_CTRL_R_OPTS --reverse - fzf_key_bindings - else - echo (set_color brcyan)'INFO: fzf not found' - end + # if command -q fzf; and functions -q fzf_key_bindings + set -gx FZF_CTRL_R_OPTS --reverse + functions -q fzf_key_bindings; and fzf_key_bindings + # else + # echo (set_color brcyan)'INFO: fzf not found' + # end + + bind -M insert ctrl-n accept-autosuggestion # Unused: alt-g, alt-z, insert ctrl-r diff --git a/.config/git/config b/.config/git/config index fcf9ae2..78c27f8 100644 --- a/.config/git/config +++ b/.config/git/config @@ -10,6 +10,8 @@ ; objectformat = sha256 [diff] tool = nvimdiff + algorithm = histogram + # colorMoved = default [pull] rebase = true [merge] @@ -17,8 +19,15 @@ [interactive] diffFilter = delta --color-only [delta] + # max-line-distance = 1.0 dark = true navigate = true + line-numbers = false + side-by-side = false + minus-style = syntax "#3f0001" + minus-emph-style = syntax "#800003" + plus-style = syntax "#003800" + plus-emph-style = syntax "#007800" [log] showSignature = true diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml index 44a659f..32ecf8d 100644 --- a/.config/helix/languages.toml +++ b/.config/helix/languages.toml @@ -1,3 +1,5 @@ +# TODO https://github.com/helix-editor/helix/wiki/Language-Server-Configurations#java + [[language]] name = "lua" auto-format = false diff --git a/.config/lazygit/config.yml b/.config/lazygit/config.yml index 4492b54..f576a99 100644 --- a/.config/lazygit/config.yml +++ b/.config/lazygit/config.yml @@ -5,5 +5,4 @@ gui: git: pagers: - colorArg: always - # --line-numbers - pager: delta --dark --paging=never + pager: delta --paging=never diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 662beca..e410043 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,4 +1,6 @@ -hwdec=auto +# hwdec=auto +hwdec=vaapi +gpu-api=vulkan cache=yes cache-pause