diff --git a/.config/yazi/init.lua b/.config/yazi/init.lua index 94242d48..904d4166 100644 --- a/.config/yazi/init.lua +++ b/.config/yazi/init.lua @@ -42,148 +42,18 @@ require("session"):setup({ require("searchjump"):setup({ unmatch_fg = catppuccin_palette.overlay0, - match_str_fg = catppuccin_palette.peach, + match_str_fg = catppuccin_palette.green, match_str_bg = catppuccin_palette.base, first_match_str_fg = catppuccin_palette.lavender, first_match_str_bg = catppuccin_palette.base, - lable_fg = catppuccin_palette.green, + lable_fg = catppuccin_palette.lavender, lable_bg = catppuccin_palette.base, only_current = false, -- only search the current window - show_search_in_statusbar = false, + show_search_in_statusbar = true, auto_exit_when_unmatch = false, - enable_capital_lable = false, - search_patterns = {}, -- demo:{"%.e%d+","s%d+e%d+"} -}) - -require("yatline"):setup({ - section_separator = { open = "", close = "" }, - inverse_separator = { open = "", close = "" }, - part_separator = { open = "", close = "" }, - - style_a = { - fg = catppuccin_palette.mantle, - bg_mode = { - normal = catppuccin_palette.blue, - select = catppuccin_palette.mauve, - un_set = catppuccin_palette.red, - }, - }, - style_b = { bg = catppuccin_palette.surface0, fg = catppuccin_palette.text }, - style_c = { bg = catppuccin_palette.base, fg = catppuccin_palette.text }, - - permissions_t_fg = catppuccin_palette.green, - permissions_r_fg = catppuccin_palette.yellow, - permissions_w_fg = catppuccin_palette.red, - permissions_x_fg = catppuccin_palette.sky, - permissions_s_fg = catppuccin_palette.lavender, - - selected = { icon = "󰻭", fg = catppuccin_palette.yellow }, - copied = { icon = "", fg = catppuccin_palette.green }, - cut = { icon = "", fg = catppuccin_palette.red }, - - total = { icon = "", fg = catppuccin_palette.yellow }, - succ = { icon = "", fg = catppuccin_palette.green }, - fail = { icon = "", fg = catppuccin_palette.red }, - found = { icon = "", fg = catppuccin_palette.blue }, - processed = { icon = "", fg = catppuccin_palette.green }, - - tab_width = 20, - tab_use_inverse = true, - - show_background = false, - - display_header_line = true, - display_status_line = true, - - header_line = { - left = { - section_a = { - { type = "line", custom = false, name = "tabs", params = { "left" } }, - }, - section_b = { - { type = "coloreds", custom = false, name = "githead" }, - }, - section_c = {}, - }, - right = { - section_a = { - { type = "string", custom = false, name = "tab_path" }, - }, - section_b = { - { type = "coloreds", custom = false, name = "task_workload" }, - }, - section_c = { - { type = "coloreds", custom = false, name = "task_states" }, - }, - }, - }, - - status_line = { - left = { - section_a = { - { type = "string", custom = false, name = "tab_mode" }, - }, - section_b = { - { type = "string", custom = false, name = "hovered_size" }, - }, - section_c = { - { type = "string", custom = false, name = "hovered_name" }, - { type = "coloreds", custom = false, name = "count" }, - }, - }, - right = { - section_a = { - { type = "string", custom = false, name = "cursor_position" }, - }, - section_b = { - { type = "string", custom = false, name = "cursor_percentage" }, - }, - section_c = { - { type = "string", custom = false, name = "hovered_file_extension", params = { true } }, - { type = "coloreds", custom = false, name = "permissions" }, - }, - }, - }, -}) - -require("yatline-githead"):setup({ - show_branch = true, - branch_prefix = "", - branch_symbol = "", - branch_borders = "", - - commit_symbol = " ", - - show_behind_ahead = true, - behind_symbol = " ", - ahead_symbol = " ", - - show_stashes = true, - stashes_symbol = " ", - - show_state = true, - show_state_prefix = true, - state_symbol = "󱅉", - - show_staged = true, - staged_symbol = " ", - - show_unstaged = true, - unstaged_symbol = " ", - - show_untracked = true, - untracked_symbol = " ", - - prefix_color = catppuccin_palette.pink, - branch_color = catppuccin_palette.pink, - commit_color = catppuccin_palette.mauve, - stashes_color = catppuccin_palette.teal, - state_color = catppuccin_palette.lavender, - staged_color = catppuccin_palette.green, - unstaged_color = catppuccin_palette.yellow, - untracked_color = catppuccin_palette.pink, - ahead_color = catppuccin_palette.green, - behind_color = catppuccin_palette.yellow, + enable_capital_lable = true, }) require("git"):setup() + +require("starship"):setup() diff --git a/.config/yazi/keymap.toml b/.config/yazi/keymap.toml index 23e696d0..4f1fc51a 100644 --- a/.config/yazi/keymap.toml +++ b/.config/yazi/keymap.toml @@ -14,14 +14,6 @@ prepend_keymap = [ { on = "J", run = "arrow 50%", desc = "Move cursor down half page" }, { on = "", run = "arrow -5", desc = "Move cursor up half page" }, { on = "", run = "arrow 5", desc = "Move cursor down half page" }, - { on = [ - "f", - "g", - ], run = "plugin fg", desc = "find file by content (fuzzy match)" }, - { on = [ - "f", - "f", - ], run = "filter --smart", desc = "Filter files" }, { on = [ "s", ], run = "plugin searchjump --autocd", desc = "Flash" }, diff --git a/.config/yazi/package.toml b/.config/yazi/package.toml index 3d55de58..41c21958 100644 --- a/.config/yazi/package.toml +++ b/.config/yazi/package.toml @@ -1,21 +1,11 @@ [[plugin.deps]] use = "yazi-rs/plugins:full-border" -rev = "b886025" +rev = "de53d90" hash = "3996fc74044bc44144b323686f887e1" -[[plugin.deps]] -use = "imsi32/yatline" -rev = "88bd1c5" -hash = "981acbe9b758b1af3a8154c932bb936d" - -[[plugin.deps]] -use = "imsi32/yatline-githead" -rev = "f8f969e" -hash = "4d441b38138ce6492a4e10fa349fd65" - [[plugin.deps]] use = "yazi-rs/plugins:git" -rev = "b886025" +rev = "de53d90" hash = "63b6c222bf2103b3023389dde5e2ecfe" [[plugin.deps]] @@ -23,5 +13,10 @@ use = "DreamMaoMao/searchjump" rev = "7fafec3" hash = "5337bf545993d8c4dec2c229031f49d" +[[plugin.deps]] +use = "Rolv-Apneseth/starship" +rev = "a63550b" +hash = "c2021386289a0cbb3e152a052f67c177" + [flavor] deps = []