From 45b0d44136e311142b45853bfd06bc6d84aba393 Mon Sep 17 00:00:00 2001 From: Michel Fedde Date: Fri, 9 May 2025 13:16:37 +0200 Subject: [PATCH] fixes yazi setup --- .config/nvim/lazy-lock.json | 40 +++++++-------- .../applications/30-GeneralPrograms.sh | 3 +- .../{30-Thunar.sh => 30-Thunar.sh.bak} | 0 .../{30-Yazi.sh.bak => 30-Yazi.sh} | 4 +- .config/yazi/init.lua | 5 -- .config/yazi/keymap.toml | 9 ++-- .config/yazi/package.toml | 51 +++++++++---------- .config/yazi/yazi.toml | 10 ++++ .gitignore | 1 + 9 files changed, 62 insertions(+), 61 deletions(-) rename .config/yadm/bootstrap.v2/applications/{30-Thunar.sh => 30-Thunar.sh.bak} (100%) rename .config/yadm/bootstrap.v2/applications/{30-Yazi.sh.bak => 30-Yazi.sh} (70%) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index f9f585c..8902b27 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,42 +1,42 @@ { "LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" }, - "blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" }, + "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, "buffer-closer.nvim": { "branch": "main", "commit": "7c5586baf634f1b7be8d9a1717953f815967be13" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "bullets.vim": { "branch": "master", "commit": "af7e7adfd0d9b349cd48eb730e337fe3628b12b2" }, - "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" }, - "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" }, + "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, + "conform.nvim": { "branch": "master", "commit": "6632e7d788a85bf8405ea0c812d343fc308b7b8c" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" }, "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" }, - "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" }, - "grug-far.nvim": { "branch": "main", "commit": "b91e6d4bad441dcaeda3d0c6df45ed270443b60a" }, - "gruvbox.nvim": { "branch": "main", "commit": "dfc89cf5ce9a5ac149dd5d4b347fc1db3c1b2fa4" }, + "gitsigns.nvim": { "branch": "main", "commit": "02eafb1273afec94447f66d1a43fc5e477c2ab8a" }, + "grug-far.nvim": { "branch": "main", "commit": "1c9325f6ab18fc8ac4d4c57e765aa845af148277" }, + "gruvbox.nvim": { "branch": "main", "commit": "a933d8666dad9363dc6908ae72cfc832299c2f59" }, "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" }, - "image.nvim": { "branch": "master", "commit": "4c51d6202628b3b51e368152c053c3fb5c5f76f2" }, + "image.nvim": { "branch": "master", "commit": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" }, - "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" }, + "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" }, "mini.hipatterns": { "branch": "main", "commit": "e5083df391171dc9d8172645606f8496d9443374" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, - "mini.nvim": { "branch": "main", "commit": "de46b3eefb810e1b251f4b19ed678d02cb08ce3f" }, + "mini.nvim": { "branch": "main", "commit": "ed581c333798e08a68fbe1aecfdf95d3c1432d3f" }, "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "a60021e199b585f560ffb380e8c464ab75d0030b" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "8d17abf5ff9208865439e683da7bbe93dde8d4e1" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, - "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" }, - "nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" }, + "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, + "nvim-lint": { "branch": "master", "commit": "3615c26c4922ae5f7366f0c1943a0e7cece04325" }, + "nvim-lspconfig": { "branch": "master", "commit": "b70b900fba6e3255a5a8113c76f213102564cb0d" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "0e3be38005e9673d044e994b1e4b123adb040179" }, + "nvim-treesitter": { "branch": "master", "commit": "684eeac91ed8e297685a97ef70031d19ac1de25a" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "205e3369bc83d8cb83f7409c36120e24611f8c5c" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "render-markdown.nvim": { "branch": "main", "commit": "006806e71199544d40b5f5a62f7079467aeac97d" }, - "smear-cursor.nvim": { "branch": "main", "commit": "162703638203060b1d3412e73429d232bbd2627e" }, + "render-markdown.nvim": { "branch": "main", "commit": "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f" }, + "smear-cursor.nvim": { "branch": "main", "commit": "cb67711016caad914e44b8d074ff1fb67845b4aa" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, diff --git a/.config/yadm/bootstrap.v2/applications/30-GeneralPrograms.sh b/.config/yadm/bootstrap.v2/applications/30-GeneralPrograms.sh index 5a9c245..32fe059 100755 --- a/.config/yadm/bootstrap.v2/applications/30-GeneralPrograms.sh +++ b/.config/yadm/bootstrap.v2/applications/30-GeneralPrograms.sh @@ -4,5 +4,4 @@ addApplications zen-browser-bin \ zathura zathura-pdf-mupdf \ onlyoffice-bin \ bitwarden \ - blueman \ - planify + blueman diff --git a/.config/yadm/bootstrap.v2/applications/30-Thunar.sh b/.config/yadm/bootstrap.v2/applications/30-Thunar.sh.bak similarity index 100% rename from .config/yadm/bootstrap.v2/applications/30-Thunar.sh rename to .config/yadm/bootstrap.v2/applications/30-Thunar.sh.bak diff --git a/.config/yadm/bootstrap.v2/applications/30-Yazi.sh.bak b/.config/yadm/bootstrap.v2/applications/30-Yazi.sh similarity index 70% rename from .config/yadm/bootstrap.v2/applications/30-Yazi.sh.bak rename to .config/yadm/bootstrap.v2/applications/30-Yazi.sh index 99cd23c..7e49529 100755 --- a/.config/yadm/bootstrap.v2/applications/30-Yazi.sh.bak +++ b/.config/yadm/bootstrap.v2/applications/30-Yazi.sh @@ -1,4 +1,6 @@ #!/bin/env sh addApplications yazi p7zip jq poppler fd ripgrep fzf zoxide imagemagick fuse-archive zip \ - blobdrop-git + blobdrop-git ouch + +addActions "ya pack -i" diff --git a/.config/yazi/init.lua b/.config/yazi/init.lua index 629ca06..7c6dc6e 100644 --- a/.config/yazi/init.lua +++ b/.config/yazi/init.lua @@ -87,9 +87,4 @@ require("yatline"):setup({ }, }) -require("fuse-archive"):setup({ - smart_enter = true, - mount_dir = "/tmp", -}) - require("git"):setup() diff --git a/.config/yazi/keymap.toml b/.config/yazi/keymap.toml index 79b2280..475cbcc 100644 --- a/.config/yazi/keymap.toml +++ b/.config/yazi/keymap.toml @@ -3,17 +3,16 @@ prepend_keymap = [ { on = [ "", "m" ], run = "plugin mount", desc = "Displays mount dialog"}, { on = [ "", 's'], run = "plugin what-size", desc = "Calc size of selection or cwd" }, { on = [ "", ''], run = "plugin what-size --args='--clipboard'", desc = "Calc size of selection or cwd" }, - { on = ["", 'c'], desc = "Archive selected files", run = "plugin compress"}, { on = ["", ""], desc = "Jump with zoxide", run = "plugin zoxide" }, + { on = "b", run = [ "toggle", "arrow next" ], desc = "Toggle the current selection state" }, + { on = "", desc = "Move to the tab on the left", run = "tab_switch 1 --relative" }, { on = "", desc = "Move to the tab on the right", run = "tab_switch -1 --relative" }, { on = ["c", 'm'], desc = "Change file mod", run = "plugin chmod"}, - - { on = [ "l" ], run = "plugin fuse-archive mount", desc = "Enter or Mount selected archive" }, - { on = [ "h" ], run = "plugin fuse-archive unmount", desc = "Leave or Unmount selected archive" }, + { on = ["", 'c'], desc = "Compress file", run = "plugin ouch" } ] append_keymap = [ { on = ['c', 'v'], desc = "Drag selected files", run = "shell 'blobdrop -b \"$@\"'" }, - { on = ['c', 'y'], desc = "Copy file/files to wl-clipboard", run = "plugin wl-clipboard"} + { on = ["c", 'k'], desc = "Send using KDE Connect", run = "plugin kdeconnect-send"} ] diff --git a/.config/yazi/package.toml b/.config/yazi/package.toml index 86fc9d2..4876f3d 100644 --- a/.config/yazi/package.toml +++ b/.config/yazi/package.toml @@ -1,42 +1,37 @@ [[plugin.deps]] use = "imsi32/yatline" -rev = "9328205" -hash = "3e51d1fd8a2e481fcfa8eab1251d1c5f" +rev = "2ecf715" +hash = "38e2ea4703ea606d4eef574e8e8b8fd7" [[plugin.deps]] use = "yazi-rs/plugins:mount" -rev = "5186af7" -hash = "5c4d8080367dd2561a18c1cf5a1dd295" - -[[plugin.deps]] -use = "pirafrank/what-size" -rev = "b23e3a4" -hash = "98e5f5af3efd3ba8bc2db0720187cc83" - -[[plugin.deps]] -use = "dawsers/fuse-archive" -rev = "a58327c" -hash = "6a6d24880ce7666048fb81ad758c48d3" - -[[plugin.deps]] -use = "KKV9/compress" -rev = "60b24af" -hash = "ee025be766240cc98e671754ac836da3" +rev = "864a021" +hash = "dd97eede8e20e59cd2604e8006e470e2" [[plugin.deps]] use = "yazi-rs/plugins:git" -rev = "5186af7" -hash = "771f18427fb75fb19990ce602bb322f4" - -[[plugin.deps]] -use = "grappas/wl-clipboard" -rev = "c4edc4f" -hash = "51ff959c3c26cb3889589a0f8d394f14" +rev = "864a021" +hash = "e0ada736ea676c2bbb3ec705a49526ef" [[plugin.deps]] use = "yazi-rs/plugins:chmod" -rev = "5186af7" -hash = "f28138c2e11e87962b66d583fef724c3" +rev = "864a021" +hash = "2f1053f89d1a301a648ab181d0948e38" + +[[plugin.deps]] +use = "pirafrank/what-size" +rev = "f1c6b69" +hash = "6e789212eb41d937bab04877ca361099" + +[[plugin.deps]] +use = "Deepak22903/kdeconnect-send" +rev = "ac23a0e" +hash = "a1e38696a2ab2c607923b77f85f8058e" + +[[plugin.deps]] +use = "ndtoan96/ouch" +rev = "2496cd9" +hash = "5b9dea47776a30946cfbf83232d18fb1" [flavor] deps = [] diff --git a/.config/yazi/yazi.toml b/.config/yazi/yazi.toml index 6c71328..e6a34ea 100644 --- a/.config/yazi/yazi.toml +++ b/.config/yazi/yazi.toml @@ -6,3 +6,13 @@ prepend_fetchers = [ { id = "git", name = "*", run = "git" }, { id = "git", name = "*/", run = "git" } ] +prepend_previewers = [ + # Archive previewer + { mime = "application/*zip", run = "ouch" }, + { mime = "application/x-tar", run = "ouch" }, + { mime = "application/x-bzip2", run = "ouch" }, + { mime = "application/x-7z-compressed", run = "ouch" }, + { mime = "application/x-rar", run = "ouch" }, + { mime = "application/x-xz", run = "ouch" }, + { mime = "application/xz", run = "ouch" }, +] diff --git a/.gitignore b/.gitignore index 5602c50..0ec56c5 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ .config/yadm/bootstrap.v2/applications/30-GitUserConfig.sh .config/yadm/bootstrap.v2/applications/40-GitRepositories.sh .config/terminal/alias.sh +.config/yadm/bootstrap.v2/applications/40-Drivers.sh