From 769700b5ec6e6e87dafd13502954549c14d43a19 Mon Sep 17 00:00:00 2001 From: aleidk Date: Wed, 26 Feb 2025 10:14:13 -0300 Subject: [PATCH] update yazi config change overriding config to prepend to avoid future deprecation warnings --- config/yazi/keymap.toml | 228 +++------------------------------------ config/yazi/package.toml | 27 ++++- 2 files changed, 35 insertions(+), 220 deletions(-) diff --git a/config/yazi/keymap.toml b/config/yazi/keymap.toml index 08f3433..f2b259c 100644 --- a/config/yazi/keymap.toml +++ b/config/yazi/keymap.toml @@ -4,134 +4,33 @@ [manager] -keymap = [ +prepend_keymap = [ { on = [""], run = "escape --all", desc = "Exit visual mode, clear selected, or cancel search" }, - { on = ["q"], run = "quit", desc = "Exit the process" }, - { on = ["Q"], run = "quit --no-cwd-file", desc = "Exit the process without writing cwd-file" }, - { on = [""], run = "close", desc = "Close the current tab, or quit if it is last tab" }, - { on = [""], run = "suspend", desc = "Suspend the process" }, - - # Hopping - { on = ["k"], run = "arrow -1", desc = "Move cursor up" }, - { on = ["j"], run = "arrow 1", desc = "Move cursor down" }, - { on = [""], run = "arrow -1", desc = "Move cursor up" }, - { on = [""], run = "arrow 1", desc = "Move cursor down" }, - - { on = [""], run = "arrow -50%", desc = "Move cursor up half page" }, - { on = [""], run = "arrow 50%", desc = "Move cursor down half page" }, - { on = [""], run = "arrow -100%", desc = "Move cursor up one page" }, - { on = [""], run = "arrow 100%", desc = "Move cursor down one page" }, - - { on = [""], run = "arrow -50%", desc = "Move cursor up half page" }, - { on = [""], run = "arrow 50%", desc = "Move cursor down half page" }, - { on = [""], run = "arrow -100%", desc = "Move cursor up one page" }, - { on = [""], run = "arrow 100%", desc = "Move cursor down one page" }, - - { on = ["g", "g"], run = "arrow -99999999", desc = "Move cursor to the top" }, - { on = ["G"], run = "arrow 99999999", desc = "Move cursor to the bottom" }, # Navigation { on = ["h"], run = ["leave", "escape --visual --select"], desc = "Go back to the parent directory" }, - { on = ["l"], run = ["enter", "escape --visual --select"], desc = "Enter the child directory" }, + # { on = ["l"], run = ["enter", "escape --visual --select"], desc = "Enter the child directory" }, + { on = ["l"], run = "plugin smart-enter", desc = "Enter the child directory, or open the file" }, { on = [""], run = ["leave", "escape --visual --select"], desc = "Go back to the parent directory" }, { on = [""], run = ["enter", "escape --visual --select"], desc = "Enter the child directory" }, - { on = ["H"], run = "back", desc = "Go back to the previous directory" }, - { on = ["L"], run = "forward", desc = "Go forward to the next directory" }, - - # Seeking - { on = ["K"], run = "seek -5", desc = "Seek up 5 units in the preview" }, - { on = ["J"], run = "seek 5", desc = "Seek down 5 units in the preview" }, - - # Selection - { on = [""], run = ["toggle", "arrow 1"], desc = "Toggle the current selection state" }, - { on = ["v"], run = "visual_mode", desc = "Enter visual mode (selection mode)" }, - { on = ["V"], run = "visual_mode --unset", desc = "Enter visual mode (unset mode)" }, - { on = [""], run = "toggle_all --state=true", desc = "Select all files" }, - { on = [""], run = "toggle_all --state=none", desc = "Inverse selection of all files" }, - # Operation - { on = ["o"], run = "open", desc = "Open the selected files" }, - { on = ["O"], run = "open --interactive", desc = "Open the selected files interactively" }, - { on = [""], run = "open", desc = "Open the selected files" }, - { on = [""], run = "open --interactive", desc = "Open the selected files interactively" }, - { on = ["y"], run = ["yank", "escape --visual --select"], desc = "Copy the selected files" }, - { on = ["Y"], run = ["unyank", "escape --visual --select"], desc = "Cancel the yank status of files" }, - { on = ["x"], run = ["yank --cut", "escape --visual --select"], desc = "Cut the selected files" }, - { on = ["p"], run = "paste", desc = "Paste the files" }, - { on = ["P"], run = "paste --force", desc = "Paste the files (overwrite if the destination exists)" }, - { on = ["-"], run = "link", desc = "Symlink the absolute path of files" }, - { on = ["_"], run = "link --relative", desc = "Symlink the relative path of files" }, - { on = ["d"], run = ["remove", "escape --visual --select"], desc = "Move the files to the trash" }, - { on = ["D"], run = ["remove --permanently", "escape --visual --select"], desc = "Permanently delete the files" }, - { on = ["a"], run = "create", desc = "Create a file or directory (ends with / for directories)" }, - { on = ["R"], run = "plugin rsync", desc = "Copy files using rsync" }, - { on = ["r"], run = "rename --cursor=before_ext", desc = "Rename a file or directory" }, - { on = [";"], run = "shell --interactive", desc = "Run a shell command" }, - { on = [":"], run = "shell --interactive --block", desc = "Run a shell command (block the UI until the command finishes)" }, - { on = ["."], run = "hidden toggle", desc = "Toggle the visibility of hidden files" }, - { on = ["s"], run = "search fd", desc = "Search files by name using fd" }, - { on = ["S"], run = "search rg", desc = "Search files by content using ripgrep" }, - { on = [""], run = "search none", desc = "Cancel the ongoing search" }, - { on = ["z"], run = "plugin zoxide", desc = "Jump to a directory using zoxide" }, - { on = ["Z"], run = "plugin fzf", desc = "Jump to a directory, or reveal a file using fzf" }, - - # Linemode - { on = ["m", "s"], run = "linemode size", desc = "Set linemode to size" }, - { on = ["m", "p"], run = "linemode permissions", desc = "Set linemode to permissions" }, - { on = ["m", "m"], run = "linemode mtime", desc = "Set linemode to mtime" }, - { on = ["m", "n"], run = "linemode none", desc = "Set linemode to none" }, + { on = ["r"], run = "rename --empty=stem --cursor=start", desc = "Rename a file or directory" }, + { on = ["R"], run = "rename --cursor=end", desc = "Rename a file or directory (keeping the current filename)" }, # Copy { on = ["c", "c"], run = "copy path", desc = "Copy the absolute path" }, { on = ["c", "d"], run = "copy dirname", desc = "Copy the path of the parent directory" }, { on = ["c", "f"], run = "copy filename", desc = "Copy the name of the file" }, { on = ["c", "n"], run = "copy name_without_ext", desc = "Copy the name of the file without the extension" }, + { on = ["c", "r"], run = "plugin rsync", desc = "Copy files using rsync" }, - # Filter - { on = ["f"], run = "filter --smart", desc = "Filter the files" }, - - # Find - { on = ["/"], run = "find --smart", desc = "Find next file" }, - { on = ["?"], run = "find --previous --smart", desc = "Find previous file" }, - { on = ["n"], run = "find_arrow", desc = "Go to next found file" }, - { on = ["N"], run = "find_arrow --previous", desc = "Go to previous found file" }, - - # Sorting - { on = [",", "m"], run = "sort mtime --reverse=no", desc = "Sort by modified time" }, - { on = [",", "M"], run = "sort mtime --reverse", desc = "Sort by modified time (reverse)" }, - { on = [",", "c"], run = "sort btime --reverse=no", desc = "Sort by created time" }, - { on = [",", "C"], run = "sort btime --reverse", desc = "Sort by created time (reverse)" }, - { on = [",", "e"], run = "sort extension --reverse=no", desc = "Sort by extension" }, - { on = [",", "E"], run = "sort extension --reverse", desc = "Sort by extension (reverse)" }, - { on = [",", "a"], run = "sort alphabetical --reverse=no", desc = "Sort alphabetically" }, - { on = [",", "A"], run = "sort alphabetical --reverse", desc = "Sort alphabetically (reverse)" }, - { on = [",", "n"], run = "sort natural --reverse=no", desc = "Sort naturally" }, - { on = [",", "N"], run = "sort natural --reverse", desc = "Sort naturally (reverse)" }, - { on = [",", "s"], run = "sort size --reverse=no", desc = "Sort by size" }, - { on = [",", "S"], run = "sort size --reverse", desc = "Sort by size (reverse)" }, - # Tabs - { on = ["t"], run = "tab_create --current", desc = "Create a new tab using the current path" }, - - { on = ["1"], run = "tab_switch 0", desc = "Switch to the first tab" }, - { on = ["2"], run = "tab_switch 1", desc = "Switch to the second tab" }, - { on = ["3"], run = "tab_switch 2", desc = "Switch to the third tab" }, - { on = ["4"], run = "tab_switch 3", desc = "Switch to the fourth tab" }, - { on = ["5"], run = "tab_switch 4", desc = "Switch to the fifth tab" }, - { on = ["6"], run = "tab_switch 5", desc = "Switch to the sixth tab" }, - { on = ["7"], run = "tab_switch 6", desc = "Switch to the seventh tab" }, - { on = ["8"], run = "tab_switch 7", desc = "Switch to the eighth tab" }, - { on = ["9"], run = "tab_switch 8", desc = "Switch to the ninth tab" }, - - { on = ["["], run = "tab_switch -1 --relative", desc = "Switch to the previous tab" }, - { on = ["]"], run = "tab_switch 1 --relative", desc = "Switch to the next tab" }, - - { on = ["{"], run = "tab_swap -1", desc = "Swap the current tab with the previous tab" }, - { on = ["}"], run = "tab_swap 1", desc = "Swap the current tab with the next tab" }, - - # Tasks - { on = ["w"], run = "tasks_show", desc = "Show the tasks manager" }, + # Goto + { on = ["g", "h"], run = "cd ~", desc = "Go home" }, + { on = ["g", "c"], run = "cd ~/.config", desc = "Goto ~/.config" }, + { on = ["g", "d"], run = "cd ~/Downloads", desc = "Goto ~/Downloads" }, + { on = ["g", ""], run = "cd --interactive", desc = "Jump interactively" }, # Goto { on = ["g", "h"], run = "cd ~", desc = "Go to the home directory" }, @@ -140,111 +39,8 @@ keymap = [ { on = ["g", "t"], run = "cd /tmp", desc = "Go to the temporary directory" }, { on = ["g", "r"], run = "shell 'ya emit cd \"$(git rev-parse --show-toplevel)\"'", desc = "Go to git root" }, { on = ["g", ""], run = "cd --interactive", desc = "Go to a directory interactively" }, - - # Help - { on = ["~"], run = "help", desc = "Open help" }, ] -[tasks] - -keymap = [{ on = [""], run = "close", desc = "Hide the task manager" }, { on = [""], run = "close", desc = "Hide the task manager" }, { on = ["w"], run = "close", desc = "Hide the task manager" }, { on = ["k"], run = "arrow -1", desc = "Move cursor up" }, { on = ["j"], run = "arrow 1", desc = "Move cursor down" }, { on = [""], run = "arrow -1", desc = "Move cursor up" }, { on = [""], run = "arrow 1", desc = "Move cursor down" }, { on = [""], run = "inspect", desc = "Inspect the task" }, { on = ["x"], run = "cancel", desc = "Cancel the task" }, { on = ["~"], run = "help", desc = "Open help" }] - -[pick] - -keymap = [{ on = [""], run = "close", desc = "Cancel selection" }, { on = [""], run = "close", desc = "Cancel selection" }, { on = [""], run = "close --submit", desc = "Submit the selection" }, { on = ["k"], run = "arrow -1", desc = "Move cursor up" }, { on = ["j"], run = "arrow 1", desc = "Move cursor down" }, { on = ["K"], run = "arrow -5", desc = "Move cursor up 5 lines" }, { on = ["J"], run = "arrow 5", desc = "Move cursor down 5 lines" }, { on = [""], run = "arrow -1", desc = "Move cursor up" }, { on = [""], run = "arrow 1", desc = "Move cursor down" }, { on = [""], run = "arrow -5", desc = "Move cursor up 5 lines" }, { on = [""], run = "arrow 5", desc = "Move cursor down 5 lines" }, { on = ["~"], run = "help", desc = "Open help" }] - -[input] - -keymap = [ - { on = [""], run = "close", desc = "Cancel input" }, - { on = [""], run = "close --submit", desc = "Submit the input" }, - { on = [""], run = "close", desc = "Go back the normal mode, or cancel input" }, - - # Mode - { on = ["i"], run = "insert", desc = "Enter insert mode" }, - { on = ["a"], run = "insert --append", desc = "Enter append mode" }, - { on = ["I"], run = ["move -999", "insert"], desc = "Move to the BOL, and enter insert mode" }, - { on = ["A"], run = ["move 999", "insert --append"], desc = "Move to the EOL, and enter append mode" }, - { on = ["v"], run = "visual", desc = "Enter visual mode" }, - { on = ["V"], run = ["move -999", "visual", "move 999"], desc = "Enter visual mode and select all" }, - - # Character-wise movement - { on = ["h"], run = "move -1", desc = "Move back a character" }, - { on = ["l"], run = "move 1", desc = "Move forward a character" }, - { on = [""], run = "move -1", desc = "Move back a character" }, - { on = [""], run = "move 1", desc = "Move forward a character" }, - { on = [""], run = "move -1", desc = "Move back a character" }, - { on = [""], run = "move 1", desc = "Move forward a character" }, - - # Word-wise movement - { on = ["b"], run = "backward", desc = "Move back to the start of the current or previous word" }, - { on = ["w"], run = "forward", desc = "Move forward to the start of the next word" }, - { on = ["e"], run = "forward --end-of-word", desc = "Move forward to the end of the current or next word" }, - { on = [""], run = "backward", desc = "Move back to the start of the current or previous word" }, - { on = [""], run = "forward --end-of-word", desc = "Move forward to the end of the current or next word" }, - - # Line-wise movement - { on = ["0"], run = "move -999", desc = "Move to the BOL" }, - { on = ["$"], run = "move 999", desc = "Move to the EOL" }, - { on = [""], run = "move -999", desc = "Move to the BOL" }, - { on = [""], run = "move 999", desc = "Move to the EOL" }, - { on = [""], run = "move -999", desc = "Move to the BOL" }, - { on = [""], run = "move 999", desc = "Move to the EOL" }, - - # Delete - { on = [""], run = "backspace", desc = "Delete the character before the cursor" }, - { on = [""], run = "backspace --under", desc = "Delete the character under the cursor" }, - { on = [""], run = "backspace", desc = "Delete the character before the cursor" }, - { on = [""], run = "backspace --under", desc = "Delete the character under the cursor" }, - - # Kill - { on = [""], run = "kill bol", desc = "Kill backwards to the BOL" }, - { on = [""], run = "kill eol", desc = "Kill forwards to the EOL" }, - { on = [""], run = "kill backward", desc = "Kill backwards to the start of the current word" }, - { on = [""], run = "kill forward", desc = "Kill forwards to the end of the current word" }, - - # Cut/Yank/Paste - { on = ["d"], run = "delete --cut", desc = "Cut the selected characters" }, - { on = ["D"], run = ["delete --cut", "move 999"], desc = "Cut until the EOL" }, - { on = ["c"], run = "delete --cut --insert", desc = "Cut the selected characters, and enter insert mode" }, - { on = ["C"], run = ["delete --cut --insert", "move 999"], desc = "Cut until the EOL, and enter insert mode" }, - { on = ["x"], run = ["delete --cut", "move 1 --in-operating"], desc = "Cut the current character" }, - { on = ["y"], run = "yank", desc = "Copy the selected characters" }, - { on = ["p"], run = "paste", desc = "Paste the copied characters after the cursor" }, - { on = ["P"], run = "paste --before", desc = "Paste the copied characters before the cursor" }, - - # Undo/Redo - { on = ["u"], run = "undo", desc = "Undo the last operation" }, - { on = [""], run = "redo", desc = "Redo the last operation" }, - - # Help - { on = ["~"], run = "help", desc = "Open help" }, -] - -[completion] - -keymap = [{ on = [""], run = "close", desc = "Cancel completion" }, { on = [""], run = "close --submit", desc = "Submit the completion" }, { on = [""], run = ["close --submit", "close_input --submit"], desc = "Submit the completion and input" }, { on = [""], run = "arrow -1", desc = "Move cursor up" }, { on = [""], run = "arrow 1", desc = "Move cursor down" }, { on = [""], run = "arrow -1", desc = "Move cursor up" }, { on = [""], run = "arrow 1", desc = "Move cursor down" }, { on = ["~"], run = "help", desc = "Open help" }] - [help] -keymap = [ - { on = [""], run = "escape", desc = "Clear the filter, or hide the help" }, - { on = ["q"], run = "close", desc = "Exit the process" }, - { on = [""], run = "close", desc = "Hide the help" }, - - # Navigation - { on = ["k"], run = "arrow -1", desc = "Move cursor up" }, - { on = ["j"], run = "arrow 1", desc = "Move cursor down" }, - - { on = ["K"], run = "arrow -5", desc = "Move cursor up 5 lines" }, - { on = ["J"], run = "arrow 5", desc = "Move cursor down 5 lines" }, - - { on = [""], run = "arrow -1", desc = "Move cursor up" }, - { on = [""], run = "arrow 1", desc = "Move cursor down" }, - - { on = [""], run = "arrow -5", desc = "Move cursor up 5 lines" }, - { on = [""], run = "arrow 5", desc = "Move cursor down 5 lines" }, - - # Filtering - { on = ["/"], run = "filter", desc = "Apply a filter for the help items" }, -] +prepend_keymap = [{ on = "q", run = "escape", desc = "Clear the filter, or hide the help" }] diff --git a/config/yazi/package.toml b/config/yazi/package.toml index ad75a40..7629b7a 100644 --- a/config/yazi/package.toml +++ b/config/yazi/package.toml @@ -1,5 +1,24 @@ -[plugin] -deps = [{ use = "yazi-rs/plugins:full-border", rev = "4a6edc3" }, { use = "GianniBYoung/rsync", rev = "3f431aa" }, { use = "Ape/simple-status", rev = "3ef1447" }] +[[plugin.deps]] +use = "yazi-rs/plugins:full-border" +rev = "5186af7" +hash = "ae9e1d0c6bfd68cdebc98cc684c22b45" -[flavor] -deps = [{ use = "yazi-rs/flavors:catppuccin-macchiato", rev = "4a3082f" }] +[[plugin.deps]] +use = "GianniBYoung/rsync" +rev = "3f431aa" +hash = "1854a5a30d23e84bc8df24700f27957b" + +[[plugin.deps]] +use = "Ape/simple-status" +rev = "d0da104" +hash = "68603fdd1dcaf415227e2c77a9317947" + +[[plugin.deps]] +use = "yazi-rs/plugins:smart-enter" +rev = "5186af7" +hash = "aef2b1a805b80cce573bb766f1459d88" + +[[flavor.deps]] +use = "yazi-rs/flavors:catppuccin-macchiato" +rev = "df95930" +hash = "c34feed32d555e79ab9a0c0a7bdda2be"