diff --git a/config/BetterDiscord/.github/README.md b/config/BetterDiscord/.github/README.md new file mode 100644 index 00000000..affa9d51 --- /dev/null +++ b/config/BetterDiscord/.github/README.md @@ -0,0 +1,3 @@ +
+ +
diff --git a/config/BetterDiscord/.github/title.png b/config/BetterDiscord/.github/title.png new file mode 100644 index 00000000..06780f9d Binary files /dev/null and b/config/BetterDiscord/.github/title.png differ diff --git a/config/BetterDiscord/data/betterdiscord.asar b/config/BetterDiscord/data/betterdiscord.asar deleted file mode 100644 index 59648f1f..00000000 Binary files a/config/BetterDiscord/data/betterdiscord.asar and /dev/null differ diff --git a/config/BetterDiscord/data/stable/misc.json b/config/BetterDiscord/data/stable/misc.json deleted file mode 100644 index a3ad9d7b..00000000 --- a/config/BetterDiscord/data/stable/misc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "1.9.7" -} \ No newline at end of file diff --git a/config/BetterDiscord/data/stable/windowprefs.json b/config/BetterDiscord/data/stable/windowprefs.json deleted file mode 100644 index ada4c7ee..00000000 --- a/config/BetterDiscord/data/stable/windowprefs.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "width": 944, - "height": 1019 -} \ No newline at end of file diff --git a/config/BetterDiscord/plugins/GameActivityToggle.config.json b/config/BetterDiscord/plugins/GameActivityToggle.config.json index 31c51615..47689974 100644 --- a/config/BetterDiscord/plugins/GameActivityToggle.config.json +++ b/config/BetterDiscord/plugins/GameActivityToggle.config.json @@ -1,7 +1,7 @@ { "all": { "cachedState": { - "date": "2023-12-20T23:14:25.548Z", + "date": "2024-01-26T23:03:18.822Z", "value": true }, "general": { diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index cade9068..862b6f37 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,13 +1,13 @@ { "LazyVim": { "branch": "main", "commit": "c433ea7aa842c446edc2b1570998bf5440c68188" }, "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "SchemaStore.nvim": { "branch": "main", "commit": "0550c6d5754dd2a183efc9c238f5524b68860e21" }, + "SchemaStore.nvim": { "branch": "main", "commit": "2579aef95ffa497314ce871626a6145bc70da51d" }, "actions-preview.nvim": { "branch": "master", "commit": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab" }, "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" }, "autolist.nvim": { "branch": "main", "commit": "5f70a5f99e96c8fe3069de042abd2a8ed2deb855" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, - "bufferline.nvim": { "branch": "main", "commit": "167c0b8c5340972a249068c1a5b3edf57806d6d3" }, - "catppuccin": { "branch": "main", "commit": "bc1f2151f23227ba02ac203c2c59ad693352a741" }, + "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, + "catppuccin": { "branch": "main", "commit": "afab7ec2a79c7127627dede79c0018b6e45663d0" }, "ccc.nvim": { "branch": "main", "commit": "ec6e23fd2c0bf4ffcf71c1271acdcee6e2c6f49c" }, "cinnamon.nvim": { "branch": "master", "commit": "c406ffda3a0302f32c23b24ab756ea20467d6578" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -16,28 +16,28 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codeium.vim": { "branch": "main", "commit": "a1c3d6b369a18514d656dac149de807becacbdf7" }, - "comment-box.nvim": { "branch": "main", "commit": "612d8d546470699d4c7991139883a390d49cf589" }, + "codeium.vim": { "branch": "main", "commit": "c272d8d164c7757b40bbd009065244440eb3fbc5" }, + "comment-box.nvim": { "branch": "main", "commit": "6394c872257bdbf60ae31aa6096c4b86b6f4b844" }, "compiler.nvim": { "branch": "main", "commit": "4a44a63b2d5bad828d1a29a28a2a9a04119e01a8" }, - "conform.nvim": { "branch": "master", "commit": "3d59cbd01a4b74124c5a6fb23b8cc63e5c2db3d5" }, - "crates.nvim": { "branch": "main", "commit": "387c10bb9bf59723f122a43b9f647a011b7d07a8" }, + "conform.nvim": { "branch": "master", "commit": "d99b75b4aedf0e912f41c5740a7267de739cddac" }, + "crates.nvim": { "branch": "main", "commit": "f2a169840e97a8ed2048abb507d2742c3895c85b" }, "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, "debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" }, "dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dooku.nvim": { "branch": "main", "commit": "632ac0e27a96e77d8be47c42583fb58c3be9d85f" }, - "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, - "dropbar.nvim": { "branch": "master", "commit": "c9962d7a62348523b92f1d1901fa7b66f622c8eb" }, + "dressing.nvim": { "branch": "master", "commit": "0e88293ce3459f4bb310125f3366304af6dc7990" }, + "dropbar.nvim": { "branch": "master", "commit": "9a8e498374276dd0281736c75b42098ef9fb5622" }, "edgy.nvim": { "branch": "main", "commit": "0b35dc6da4cae6cc2f724bc610eadf955cd2319b" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, "garbage-day.nvim": { "branch": "main", "commit": "957499b8a493974bd7002b68b1f15f7d285e0dd1" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, - "gitsigns.nvim": { "branch": "main", "commit": "300a306da9973e81c2c06460f71fd7a079df1f36" }, + "gitsigns.nvim": { "branch": "main", "commit": "fb9fd5312476b51a42a98122616e1c448d823d5c" }, "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, "go.nvim": { "branch": "master", "commit": "24d2fa373d55d9900cd4b502a88214dc17e6fab6" }, "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" }, - "harpoon": { "branch": "harpoon2", "commit": "2cd4e03372f7ee5692c8caa220f479ea07970f17" }, + "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" }, "headlines.nvim": { "branch": "master", "commit": "e3d7bfdf40e41a020d966d35f8b48d75b90367d2" }, "highlight-undo.nvim": { "branch": "main", "commit": "50a6884a8476be04ecce8f1c4ed692c5000ef0a1" }, "hydra.nvim": { "branch": "master", "commit": "55de54543d673824435930ecf533256eea2e565b" }, @@ -45,15 +45,15 @@ "import-cost.nvim": { "branch": "main", "commit": "39ef36f438574db0b26e9c957316eb1cb22e970f" }, "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, - "kitty-scrollback.nvim": { "branch": "main", "commit": "89090f132cb5eb2843287d9e9971d0d1ee208767" }, + "kitty-scrollback.nvim": { "branch": "main", "commit": "f5fb79107d9fb6eae145bb1a692121965d818270" }, "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" }, "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, - "mason.nvim": { "branch": "main", "commit": "9c9416817c9f4e6f333c749327a1ed5355cfab61" }, + "mason.nvim": { "branch": "main", "commit": "dcd0ea30ccfc7d47e879878d1270d6847a519181" }, "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" }, "mini.ai": { "branch": "main", "commit": "13a9074677e725e9ed230f860126db624b690dfc" }, "mini.align": { "branch": "main", "commit": "708c0265b1513a00c83c181bff3d237741031cd1" }, @@ -63,16 +63,16 @@ "mini.surround": { "branch": "main", "commit": "3c98c6be8028139a114081e06d2a9f1ac3f4b7fc" }, "multicursors.nvim": { "branch": "main", "commit": "8e876fe9db46c1b76c151202b418df21eca07bad" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "2f2d08894bbc679d4d181604c16bb7079f646384" }, - "neoconf.nvim": { "branch": "main", "commit": "cfc29315288515849aa54c05828d49f01f033b66" }, - "neodev.nvim": { "branch": "main", "commit": "e7ca4a2ea0da5e39a639c08c3edb352b9355f09e" }, + "neoconf.nvim": { "branch": "main", "commit": "bf04719b3b25ba5f6a059c0a10ee67e5996bdc4c" }, + "neodev.nvim": { "branch": "main", "commit": "64b2a51b02c6f2ae177c745e4d8bc801a339fe09" }, "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, - "neotest": { "branch": "master", "commit": "dcdb40ea48f9c7b67a5576f6bb2e5f63ec15f2c0" }, + "neotest": { "branch": "master", "commit": "73043d666780e35185a77589e01bec96a52db910" }, "neotest-bash": { "branch": "main", "commit": "2eaad2ae4577fadf4af1eec32ec169d0fb2698bb" }, "neotest-go": { "branch": "main", "commit": "d29d20d912aca81a07c50022d880cc66f0d26542" }, "neotest-jest": { "branch": "main", "commit": "a394106cf053eef86d65ae04c4b93a1a7bd60aef" }, "neotest-mocha": { "branch": "main", "commit": "68f0e9768a94c3ebd4d5e67b2765e6a5df017d99" }, "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, - "neotest-rust": { "branch": "main", "commit": "3a3ebe60c2b655dcf8b2da64fe80fcd923feea0a" }, + "neotest-rust": { "branch": "main", "commit": "392b54e18174b8c69eba779f94a9fd0b318d383e" }, "neotest-vitest": { "branch": "main", "commit": "87e91bfd9419a8c74bf0d105e2ae31b9692daf0b" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, @@ -88,22 +88,22 @@ "nvim-devdocs": { "branch": "master", "commit": "521d24661ffe6d1ba025debea2675c765a9c1ee1" }, "nvim-jqx": { "branch": "master", "commit": "11b1d0368e5b23b9c356da8e5f70bb5827f27f62" }, "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" }, - "nvim-lint": { "branch": "master", "commit": "2cf9ad095130755d7d87f1730bcf33c91ee822e4" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "4c67b566ef8bb513692c1f26637ff3356ab02f43" }, + "nvim-lint": { "branch": "master", "commit": "8e5920f9ce9f24c283a2e64be5fe58d1d37d1744" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" }, "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, "nvim-notify": { "branch": "master", "commit": "80b67b265530632505193553d05127ae7fe09ddd" }, "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" }, "nvim-origami": { "branch": "main", "commit": "4ec426ce4b0aad0303af44909f86e075dd65c615" }, - "nvim-puppeteer": { "branch": "main", "commit": "d7e1b2d67c89d32b6ecada88ff67b539ba09f2d7" }, + "nvim-puppeteer": { "branch": "main", "commit": "048c819c8033e5febe0a04e63b98e74a5d0f8de6" }, "nvim-recorder": { "branch": "main", "commit": "bf9efe10bff3ae8461568eee7f0d6c8750b01569" }, "nvim-regexplainer": { "branch": "main", "commit": "78fff711edcb986a05a03253c28a90e32c4ce31f" }, - "nvim-scissors": { "branch": "main", "commit": "63d05e732d1403fcd7c7e1fb6b55763adcd08b64" }, - "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" }, - "nvim-treesitter": { "branch": "master", "commit": "023a8ee9a2e3fcb134f0155d9390e068e85bb4f4" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2972717355a18d5599e9162f48d6e3e584068bf9" }, + "nvim-scissors": { "branch": "main", "commit": "6f928de59253c270d7f6b58bb49c9322cebfcdbe" }, + "nvim-spectre": { "branch": "master", "commit": "d958cc3ea8b3fb2f0922dff6177630a40751a3a9" }, + "nvim-treesitter": { "branch": "master", "commit": "e0edcbb1d27b679a0f48f2557db655855ba5434c" }, + "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, "nvim-various-textobjs": { "branch": "main", "commit": "ca9e6f290c25f6a3168c5dd64b9ef0a8000263d9" }, @@ -121,10 +121,9 @@ "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "35530b4ad48f01bdaa852da34e4de9930fb54c89" }, - "refactoring.nvim": { "branch": "master", "commit": "f4546284059f7dc01f65be93d03f6c850fd2aba1" }, - "rest.nvim": { "branch": "main", "commit": "84e81a19ab24ccf05c9233d34d4dfce61c233abe" }, - "rustaceanvim": { "branch": "master", "commit": "94dbc3479630b79f1fc05bad91dfeede50b9036c" }, - "satellite.nvim": { "branch": "main", "commit": "99610b77fe2e047d2e55d70a256bcf63953eb6d7" }, + "refactoring.nvim": { "branch": "master", "commit": "aff2e21e2f1a19d302adceb4e7d0fafbb3ae59a9" }, + "rest.nvim": { "branch": "main", "commit": "2d7bd3d398940ce2692941e6cd052c072207b9f9" }, + "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" }, "search-replace.nvim": { "branch": "main", "commit": "d92290a02d97f4e9b8cd60d28b56b403432158d5" }, "semshi": { "branch": "master", "commit": "0182447e2ff4dfa04cd2dfe5f189e012c581ca45" }, "smart-splits.nvim": { "branch": "master", "commit": "36bfe63246386fc5ae2679aa9b17a7746b7403d5" }, @@ -143,7 +142,7 @@ "telescope-luasnip.nvim": { "branch": "master", "commit": "2ef7da3a363890686dbaad18ddbf59177cfe4f78" }, "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "301505da4bb72d11ffeee47ad45e0b677f70abe5" }, + "telescope.nvim": { "branch": "master", "commit": "1bfbb1fb5c56d2dbe33216fcb2ebe82e499aa06c" }, "text-case.nvim": { "branch": "main", "commit": "6bc91cde614bbec6f0befbaf7fcd302415d803fb" }, "theme-loader.nvim": { "branch": "master", "commit": "ad8774ec8267a447d469b4e6603b43f49b946e53" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, @@ -160,9 +159,9 @@ "vim-carbon-now-sh": { "branch": "master", "commit": "31a18d26fc27e7bd5786da092ed886273b4cf639" }, "vim-dadbod": { "branch": "master", "commit": "738cfc2ea6a1510fe23cba9006fef9291be70f7b" }, "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" }, - "vim-dadbod-ui": { "branch": "master", "commit": "e99dcfd5162d9b9b4b24a5d035cf114315f1aeec" }, + "vim-dadbod-ui": { "branch": "master", "commit": "165699c573469e6a95b48d35052f848c340c5911" }, "vim-floaterm": { "branch": "master", "commit": "3f01a623376957437f9376327637491b74719e38" }, - "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, + "vim-illuminate": { "branch": "master", "commit": "97c1265ff0b67064b6cfdc15bafc50202a537ae2" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, "vim-uppercase-sql": { "branch": "master", "commit": "58bfde1d679a1387dabfe292b38d51d84819b267" }, "vim-wakatime": { "branch": "master", "commit": "cae21a19c3db4d9aadd5d320de3da0c99dfd0f62" }, diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index 1fdbbc3e..f017b13a 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -89,7 +89,6 @@ "plugins.extras.ui.import-cost", "plugins.extras.ui.number-toggle", "plugins.extras.ui.rainbow-delimeters", - "plugins.extras.ui.scrollbar", "plugins.extras.ui.smooth-scrolling", "plugins.extras.ui.windows", "plugins.extras.ui.zen-mode", diff --git a/config/nvim/lua/plugins/extras/lang/java-extended.lua b/config/nvim/lua/plugins/extras/lang/java-extended.lua index 8ebd14f5..978deda2 100644 --- a/config/nvim/lua/plugins/extras/lang/java-extended.lua +++ b/config/nvim/lua/plugins/extras/lang/java-extended.lua @@ -15,10 +15,8 @@ return { { "williamboman/mason.nvim", opts = function(_, opts) - opts.registries = { - "github:nvim-java/mason-registry", - "github:mason-org/mason-registry", - } + opts.registries = opts.registries or {} + table.insert(opts.registries, 1, "github:nvim-java/mason-registry") opts.ensure_installed = opts.ensure_installed or {} vim.list_extend(opts.ensure_installed, { "java-test", "java-debug-adapter" }) end, diff --git a/config/nvim/lua/plugins/neo-tree.lua b/config/nvim/lua/plugins/neo-tree.lua index 7a9fe89a..0f33658d 100644 --- a/config/nvim/lua/plugins/neo-tree.lua +++ b/config/nvim/lua/plugins/neo-tree.lua @@ -8,6 +8,7 @@ return { window = { mappings = { ["l"] = "open", + ["e"] = "open", ["h"] = "close_node", }, }, diff --git a/config/yazi/.github/README.md b/config/yazi/.github/README.md new file mode 100644 index 00000000..affa9d51 --- /dev/null +++ b/config/yazi/.github/README.md @@ -0,0 +1,3 @@ +
+ +
diff --git a/config/yazi/.github/title.png b/config/yazi/.github/title.png new file mode 100644 index 00000000..5622afd2 Binary files /dev/null and b/config/yazi/.github/title.png differ diff --git a/config/yazi/init.lua b/config/yazi/init.lua new file mode 100644 index 00000000..0b6fbfda --- /dev/null +++ b/config/yazi/init.lua @@ -0,0 +1,66 @@ +-- Border +function Manager:render(area) + self.area = area + + local chunks = ui.Layout() + :direction(ui.Layout.HORIZONTAL) + :constraints({ + ui.Constraint.Ratio(MANAGER.ratio.parent, MANAGER.ratio.all), + ui.Constraint.Ratio(MANAGER.ratio.current, MANAGER.ratio.all), + ui.Constraint.Ratio(MANAGER.ratio.preview, MANAGER.ratio.all), + }) + :split(area) + + local bar = function(c, x, y) + return ui.Bar( + ui.Rect({ x = math.max(0, x), y = math.max(0, y), w = math.min(1, area.w), h = math.min(1, area.h) }), + ui.Bar.TOP + ):symbol(c) + end + + return ya.flat({ + -- Borders + ui.Border(area, ui.Border.ALL):type(ui.Border.ROUNDED), + ui.Bar(chunks[1], ui.Bar.RIGHT), + ui.Bar(chunks[3], ui.Bar.LEFT), + + bar("┬", chunks[1].right - 1, chunks[1].y), + bar("┴", chunks[1].right - 1, chunks[1].bottom - 1), + bar("┬", chunks[2].right, chunks[2].y), + bar("┴", chunks[2].right, chunks[1].bottom - 1), + + -- Parent + Parent:render(chunks[1]:padding(ui.Padding.xy(1))), + -- Current + Current:render(chunks[2]:padding(ui.Padding.y(1))), + -- Preview + Preview:render(chunks[3]:padding(ui.Padding.xy(1))), + }) +end + +-- Show user/group of files in status bar +function Status:owner() + local h = cx.active.current.hovered + if h == nil or ya.target_family() ~= "unix" then + return ui.Line({}) + end + + return ui.Line({ + ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"), + ui.Span(":"), + ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"), + ui.Span(" "), + }) +end + +function Status:render(area) + self.area = area + + local left = ui.Line({ self:mode(), self:size(), self:name() }) + local right = ui.Line({ self:owner(), self:permissions(), self:percentage(), self:position() }) + return { + ui.Paragraph(area, { left }), + ui.Paragraph(area, { right }):align(ui.Paragraph.RIGHT), + table.unpack(Progress:render(area, right:width())), + } +end diff --git a/config/yazi/keymap.toml b/config/yazi/keymap.toml new file mode 100644 index 00000000..a5fdc170 --- /dev/null +++ b/config/yazi/keymap.toml @@ -0,0 +1,42 @@ +"$schema" = "https://yazi-rs.github.io/schemas/keymap.json" + +[manager] + +prepend_keymap = [ + { on = [ + "", + ], exec = '''shell "$SHELL" --block --confirm''', desc = "Open shell here" }, +] + +append_keymap = [ + { on = [ + "e", + ], exec = "open", desc = "Open the selected files" }, + { on = [ + "E", + ], exec = "open --interactive", desc = "Open the selected files interactively" }, + { on = [ + "g", + "n", + ], exec = "cd ~/.config/nvim", desc = "Go to the nvim directory" }, + { on = [ + "g", + "v", + ], exec = "cd ~/Videos", desc = "Go to the videos directory" }, + { on = [ + "g", + "i", + ], exec = "cd ~/Imagenes", desc = "Go to the images directory" }, + { on = [ + "g", + "D", + ], exec = "cd ~/Documentos", desc = "Go to the docs directory" }, + { on = [ + "g", + "o", + ], exec = "cd ~/Documentos/Obsidian/obsidianVault/", desc = "Go to the obsidian directory" }, +] + +[input] + +prepend_keymap = [{ on = [""], exec = "close", desc = "Cancel input" }] diff --git a/config/yazi/symlink.lua b/config/yazi/symlink.lua deleted file mode 100644 index 5ff1d3d0..00000000 --- a/config/yazi/symlink.lua +++ /dev/null @@ -1,12 +0,0 @@ -function Status:name() - local h = cx.active.current.hovered - if h == nil then - return ui.Span("") - end - - local linked = "" - if h.link_to ~= nil then - linked = " -> " .. tostring(h.link_to) - end - return ui.Span(" " .. h.name .. linked) -end diff --git a/config/yazi/theme.toml b/config/yazi/theme.toml index c6433e17..55be588e 100644 --- a/config/yazi/theme.toml +++ b/config/yazi/theme.toml @@ -1,11 +1,6 @@ -# vim:fileencoding=utf-8:foldmethod=marker - -# : Manager {{{ +"$schema" = "https://yazi-rs.github.io/schemas/theme.json" [manager] -folder_offset = [2, 0, 2, 0] -preview_offset = [2, 1, 2, 1] - cwd = { fg = "#8bd5ca" } # Hovered @@ -33,10 +28,6 @@ border_style = { fg = "#8087a2" } # Highlighting syntect_theme = "~/.config/bat/themes/Catppuccin-macchiato.tmTheme" -# : }}} - - -# : Status {{{ [status] separator_open = "" @@ -60,10 +51,6 @@ permissions_w = { fg = "#ed8796" } permissions_x = { fg = "#a6da95" } permissions_s = { fg = "#8087a2" } -# : }}} - - -# : Input {{{ [input] border = { fg = "#8aadf4" } @@ -71,30 +58,18 @@ title = {} value = {} selected = { reversed = true } -# : }}} - - -# : Select {{{ [select] border = { fg = "#8aadf4" } active = { fg = "#f5bde6" } inactive = {} -# : }}} - - -# : Tasks {{{ [tasks] border = { fg = "#8aadf4" } title = {} hovered = { underline = true } -# : }}} - - -# : Which {{{ [which] mask = { bg = "#363a4f" } @@ -116,10 +91,6 @@ desc = { fg = "#939ab7" } hovered = { bg = "#5b6078", bold = true } footer = { fg = "#494d64", bg = "#cad3f5" } -# : }}} - - -# : File-specific styles {{{ [filetype] @@ -144,5 +115,3 @@ rules = [ { name = "*", fg = "#cad3f5" }, { name = "*/", fg = "#8aadf4" }, ] - -# : }}} diff --git a/config/yazi/ui.lua b/config/yazi/ui.lua deleted file mode 100644 index 02e77bbf..00000000 --- a/config/yazi/ui.lua +++ /dev/null @@ -1,32 +0,0 @@ -function Manager:render(area) - local chunks = ui.Layout() - :direction(ui.Direction.HORIZONTAL) - :constraints({ - ui.Constraint.Ratio(MANAGER.layout.parent, MANAGER.layout.all), - ui.Constraint.Ratio(MANAGER.layout.current, MANAGER.layout.all), - ui.Constraint.Ratio(MANAGER.layout.preview, MANAGER.layout.all), - }) - :split(area) - - local bar = function(c, x, y) - return ui.Bar(ui.Rect({ x = math.max(0, x), y = math.max(0, y), w = 1, h = 1 }), ui.Position.TOP):symbol(c) - end - - return utils.flat({ - ui.Border(area, ui.Position.ALL):type(ui.Border.ROUNDED), - ui.Bar(chunks[1], ui.Position.RIGHT), - ui.Bar(chunks[3], ui.Position.LEFT), - - bar("┬", chunks[1].right - 1, chunks[1].y), - bar("┴", chunks[1].right - 1, chunks[1].bottom - 1), - bar("┬", chunks[2].right, chunks[2].y), - bar("┴", chunks[2].right, chunks[1].bottom - 1), - - -- Parent - Folder:render(chunks[1]:padding(ui.Padding.xy(1)), { kind = Folder.PARENT }), - -- Current - Folder:render(chunks[2]:padding(ui.Padding.y(1)), { kind = Folder.CURRENT }), - -- Preview - ui.Base(chunks[3]:padding(ui.Padding.xy(1)), ui.Base.PREVIEW), - }) -end diff --git a/config/yazi/yazi.toml b/config/yazi/yazi.toml index 832fd742..b0d1ac40 100644 --- a/config/yazi/yazi.toml +++ b/config/yazi/yazi.toml @@ -1,5 +1,7 @@ +"$schema" = "https://yazi-rs.github.io/schemas/yazi.json" + [manager] -layout = [1, 4, 3] +ratio = [1, 4, 3] sort_by = "natural" sort_reverse = false sort_dir_first = true @@ -73,6 +75,3 @@ bizarre_retry = 5 [log] enabled = false - -[plugins] -preload = ["~/.config/yazi/ui.lua", "~/.config/yazi/symlink.lua"]