From 6fdca49fcab421557e09aacfd60f50d87d07b5bf Mon Sep 17 00:00:00 2001 From: Anton Bilous Date: Mon, 10 Nov 2025 19:52:45 +0200 Subject: [PATCH] d --- .../functions/fish_user_key_bindings.fish | 30 ++++--------------- .config/git/config | 25 +++++++++------- .config/helix/config.toml | 13 ++++---- .config/yazi/keymap.toml | 11 +++++-- 4 files changed, 36 insertions(+), 43 deletions(-) diff --git a/.config/fish/functions/fish_user_key_bindings.fish b/.config/fish/functions/fish_user_key_bindings.fish index 367e9bd..aaf8801 100644 --- a/.config/fish/functions/fish_user_key_bindings.fish +++ b/.config/fish/functions/fish_user_key_bindings.fish @@ -1,25 +1,7 @@ function fish_user_key_bindings - if command -q fzf - set -gx FZF_CTRL_R_OPTS '--reverse' - - function bind; end # thanks fzf for not using `builtin` - if functions -q fzf_key_bindings - fzf_key_bindings - else - echo (set_color bryellow)'WARNING: using `fzf --fish | source`' - command fzf --fish | source - end - functions -e bind - - # FZF_ALT_C_COMMAND, FZF_ALT_C_OPTS - bind alt-c fzf-cd-widget - bind -M insert alt-c fzf-cd-widget - # FZF_CTRL_T_COMMAND, FZF_CTRL_T_OPTS - bind alt-f fzf-file-widget - bind -M insert alt-f fzf-file-widget - # FZF_CTRL_R_OPTS - bind ctrl-f fzf-history-widget - bind -M insert ctrl-f fzf-history-widget + 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 @@ -29,9 +11,9 @@ function fish_user_key_bindings bind alt-t transpose-words bind -M insert alt-t transpose-words bind -M visual alt-t transpose-words - bind ctrl-t transpose-chars - bind -M insert ctrl-t transpose-chars - bind -M visual ctrl-t transpose-chars + # bind ctrl-t transpose-chars + # bind -M insert ctrl-t transpose-chars + # bind -M visual ctrl-t transpose-chars bind ctrl-z 'fish_commandline_append " &; disown"' bind -M insert ctrl-z 'fish_commandline_append " &; disown"' diff --git a/.config/git/config b/.config/git/config index 5552dc5..3405bf7 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,20 +1,29 @@ [init] defaultBranch = main -[diff] - tool = nvimdiff +[fetch] + prune = true [core] editor = helix - pager = delta + pager = delta ; repositoryformatversion = 1 ; [extensions] ; objectformat = sha256 +[diff] + tool = nvimdiff +[merge] + conflictStyle = zdiff3 +[interactive] + diffFilter = delta --color-only +[delta] + dark = true + navigate = true + [log] showSignature = true abbrevCommit = true + [gpg "ssh"] allowedSignersFile = ~/.config/git/allowed_signers -[fetch] - prune = true [includeIf "gitdir:~/src/"] path = ~/src/.gitconfig @@ -24,9 +33,3 @@ ; clean = git-lfs clean -- %f ; smudge = git-lfs smudge -- %f ; process = git-lfs filter-process -[interactive] - diffFilter = delta --color-only -[delta] - navigate = true -[merge] - conflictStyle = zdiff3 diff --git a/.config/helix/config.toml b/.config/helix/config.toml index 1a40705..d74a679 100644 --- a/.config/helix/config.toml +++ b/.config/helix/config.toml @@ -98,11 +98,13 @@ wrap-indicator = "↪" [keys.insert] tab = "completion" -A-tab = "insert_tab" +S-tab = "insert_tab" +# A-tab = "move_parent_node_end" C-space = "signature_help" C-backspace = "delete_word_backward" -# tab = "move_parent_node_end" -# S-tab = "move_parent_node_start" + +A-e = "move_parent_node_end" +A-b = "move_parent_node_start" [keys.select] @@ -119,7 +121,7 @@ C-backspace = "delete_word_backward" tab = "expand_selection" S-tab = "shrink_selection" -A-tab = "insert_tab" +# A-tab = "insert_tab" # tab = "extend_parent_node_end" # S-tab = "extend_parent_node_start" @@ -146,7 +148,7 @@ C-space = "signature_help" tab = "expand_selection" S-tab = "shrink_selection" -A-tab = "insert_tab" +# A-tab = "insert_tab" # tab = "move_parent_node_end" # S-tab = "move_parent_node_start" @@ -178,6 +180,7 @@ q = ":buffer-close" Q = ":buffer-close-all" o = ":buffer-close-others" n = "file_picker_in_current_buffer_directory" +ret = "insert_newline" # Toggle [keys.normal.space.t] diff --git a/.config/yazi/keymap.toml b/.config/yazi/keymap.toml index 89f221c..da7bf94 100644 --- a/.config/yazi/keymap.toml +++ b/.config/yazi/keymap.toml @@ -3,14 +3,19 @@ [mgr] prepend_keymap = [ # { on = "", run = "plugin wl-clipboard", desc = "Yank to clipboard" }, - { on = "", run = 'shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list' }, + { on = "", run = 'shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list', desc = "Yank to clipboard" }, { on = "", run = 'shell -- dragon-drop -x -a -T -s 256 "$@"', desc = "Open drag and drop window" }, + { on = "!", run = 'shell "$SHELL" --block', desc = "Open $SHELL here" }, { on = "R", run = "rename --empty=stem --cursor=start", desc = "Rename file full" }, + # { on = [ + # "g", + # "d", + # ], run = "cd ~/documents", desc = "Goto ~/documents" }, { on = [ "g", - "d", - ], run = "cd ~/documents", desc = "Goto ~/documents" }, + "r", + ], run = 'shell -- ya emit cd "$(git rev-parse --show-toplevel)"', desc = "Go git root" }, { on = "", run = "search --via=rga", desc = "Search files by content via ripgrep-all" }, ]