zoriya/flake
1
0
Fork 0
mirror of https://github.com/zoriya/flake.git synced 2026-05-27 16:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use more mini plugins

Browse Source
This commit is contained in:
Zoe Roux
2024-11-19 23:30:50 +01:00
parent d7380bf17c
commit 3d138c594b
5 changed files with 89 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/cli/nvim/lazy-lock.json
+32 -34
View File
@@ -1,65 +1,63 @@
{
"ReplaceWithRegister": { "branch": "master", "commit": "832efc23111d19591d495dc72286de2fb0b09345" },
"SchemaStore.nvim": { "branch": "main", "commit": "fa562602268fc7335fd2b7581ddf9e67e70f18b6" },
"SchemaStore.nvim": { "branch": "main", "commit": "291b15c6a03d8f859da8d83f46ed41ae6bb0ea8d" },
"auto-save.nvim": { "branch": "main", "commit": "5fbcaac0a2698c87a9a1bd2083cb6949505cca12" },
"blame.nvim": { "branch": "main", "commit": "20cf0918962fa2da787c4b25331f6024d1b1d808" },
"catppuccin": { "branch": "main", "commit": "d9ee9a35f46f0a2bda9a15b5a763fee4095428fd" },
"cmp-git": { "branch": "main", "commit": "741b6a759dbbcc55e9e5d72e2a84099cf6f4af9c" },
"catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" },
"cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"conform.nvim": { "branch": "master", "commit": "8a3fd27fddffe2d2eb24eab90e105ad66e20423c" },
"dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
"fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
"conform.nvim": { "branch": "master", "commit": "10fd7c1a6f10915093b7fd93001cf8daf93028a4" },
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
"fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
"flit.nvim": { "branch": "main", "commit": "1ef72de6a02458d31b10039372c8a15ab8989e0d" },
"git-conflict.nvim": { "branch": "main", "commit": "ed1ca6dfd60bf609714f791cfa63aee33aef64ed" },
"gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
"gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" },
"harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
"git-conflict.nvim": { "branch": "main", "commit": "4dc906855751096aaeba2edde7c2cdc7bb881c98" },
"gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" },
"harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
"increment-activator": { "branch": "master", "commit": "b49fc24094f93aa29a7592034b97095b709c3528" },
"indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" },
"lazy-lsp.nvim": { "branch": "master", "commit": "8cfb2329a4cdc8e1eefe47dc18fb8e8c6dbdf183" },
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
"lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" },
"indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
"lazy-lsp.nvim": { "branch": "master", "commit": "8fe5329c92bbd0830e22bd6f6e6ee64275b2a68b" },
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
"lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" },
"leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" },
"lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" },
"lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" },
"ltex_extra.nvim": { "branch": "dev", "commit": "57192d7ae5ba8cef3c10e90f2cd62d4a7cdaab69" },
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"mini-git": { "branch": "main", "commit": "f75ae3855f595e55e1a8a96521ffa01012632b28" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"luvit-meta": { "branch": "main", "commit": "13e9813f7115dbacd6b0a99b349c9bd332c7d1f9" },
"mini.ai": { "branch": "main", "commit": "31c149067d38b97720d2a179619f7745a0006ecc" },
"mini.align": { "branch": "main", "commit": "26111a737494bc39576ad67b52bbc2638ca23553" },
"mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" },
"mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
"mini.operators": { "branch": "main", "commit": "7cb4dc66c51a3d736d347bbc517dc73dc7d28888" },
"mini.splitjoin": { "branch": "main", "commit": "3e92f6764e770ba392325cad3a4497adcada695f" },
"neogen": { "branch": "main", "commit": "e932ba918b56723436b77aa3efb844a11b2851ab" },
"noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" },
"mini.surround": { "branch": "main", "commit": "48a9795c9d352c771e1ab5dedab6063c0a2df037" },
"neogen": { "branch": "main", "commit": "e3b8f6dca1c67c73ae2817418d39c061fdb65064" },
"noice.nvim": { "branch": "main", "commit": "203f74adaae11d47440a667555b4af9156be807b" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
"nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
"nvim-colorizer.lua": { "branch": "master", "commit": "0671e0eabc6842676d3310370e8fae4e1c51d7f9" },
"nvim-lint": { "branch": "master", "commit": "16b21a7d04d06661f92f273a0744fd81fb19e09e" },
"nvim-lspconfig": { "branch": "master", "commit": "85afd4b936acd62b578c2e2d8e86541fb972c32e" },
"nvim-cmp": { "branch": "main", "commit": "40a03dc225383c4f6256596c2cdf27e03b8119b5" },
"nvim-colorizer.lua": { "branch": "master", "commit": "547a45bbf5bf57c088f6f77924d503f95de1561a" },
"nvim-lint": { "branch": "master", "commit": "8e9562de7261e5b862c631958df616e1a65552cd" },
"nvim-lspconfig": { "branch": "master", "commit": "f012c1b176f0e3c71f40eb309bdec0316689462e" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-pqf": { "branch": "main", "commit": "148ee2ca8b06d83fd9bf6f9b9497724ad39a07d6" },
"nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" },
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
"nvim-treesitter": { "branch": "master", "commit": "377039daa260b71f304c881d1b21d643c501a261" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" },
"nvim-treesitter": { "branch": "master", "commit": "c50981479e4271ec87c5a15ec991472bdec4f1b8" },
"nvim-type-fmt": { "branch": "main", "commit": "6c1f520f04c1e4f924dae4e822262d7186b5ed59" },
"oil.nvim": { "branch": "master", "commit": "39dbf875861449cf09e936fa80073f3413e9439c" },
"oil.nvim": { "branch": "master", "commit": "8ea40b5506115b6d355e304dd9ee5089f7d78601" },
"omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "aad7bf06b4ca0de816b919d475a75b30f5f62b61" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"statuscol.nvim": { "branch": "0.10", "commit": "b0de00dfcf583bdd94284d844aac1b134d47c578" },
"telescope-fzf-native.nvim": { "branch": "feature/69-prebuilt-release-binaries", "commit": "af1d3c6efa0124123272bba094a60e15682c9cd5" },
"telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" },
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
"trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
"ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" },
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" },
"vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
"vim-lumen": { "branch": "master", "commit": "ac13c32c3e309f6c6a84ff6cad8dbb135e75f0e4" },
"vim-matchup": { "branch": "master", "commit": "2328f4a3082093fe61f6d8004572f905cc1b58f4" },
"vim-matchup": { "branch": "master", "commit": "5fb083de1e06fdd134c6ad8d007d4b5576b25ba7" },
"vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
"vim-wordmotion": { "branch": "master", "commit": "81d9bd298376ab0dc465c85d55afa4cb8d5f47a1" },
"virtcolumn.nvim": { "branch": "main", "commit": "2291fe12098f1541483e7ee4d0fa0835c1f028f6" },
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" },
"which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" },
"zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
}
modules/cli/nvim/lua/plugins/git.lua
-55
View File
@@ -70,59 +70,4 @@ return {
end,
},
},
{
"ruifm/gitlinker.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
config = true,
keys = {
{ "<leader>gy", mode = { "n", "v" }, desc = "Yank remote git url" },
{
"<leader>go",
function()
require("gitlinker").get_buf_range_url("n", {
action_callback = require "gitlinker.actions".open_in_browser
})
end,
mode = "n",
desc = "Open in browser"
},
{
"<leader>go",
function()
require("gitlinker").get_buf_range_url("v", {
action_callback = require "gitlinker.actions".open_in_browser
})
end,
mode = "v",
desc = "Open in browser"
},
},
},
{
"echasnovski/mini-git",
main = 'mini.git',
config = true,
cmd = "Git",
keys = {
{
"<leader>gi",
function()
require("mini.git").show_at_cursor({})
end,
desc = "Show info at cursor",
mode = { "n", "x" },
},
},
init = function()
vim.api.nvim_create_autocmd("FileType", {
group = vim.api.nvim_create_augroup("MiniGit", { clear = true }),
pattern = "git",
callback = function()
vim.bo.foldexpr = "v:lua.MiniGit.diff_foldexpr()"
end,
})
end
},
}
modules/cli/nvim/lua/plugins/motions.lua
+44 -12
View File
@@ -2,10 +2,10 @@ return {
{
"ggandor/leap.nvim",
keys = {
{ "s", "<Plug>(leap-forward-till)", mode = { "n", "x", }, desc = "Leap forward to" },
{ "S", "<Plug>(leap-backward)", mode = { "n", "x", }, desc = "Leap backward to" },
{ "z", "<Plug>(leap-forward-till)", mode = "o", desc = "Leap forward to" },
{ "Z", "<Plug>(leap-backward)", mode = "o", desc = "Leap backward to" },
{ "s", "<Plug>(leap-forward-till)", mode = { "n", "x", }, desc = "Leap forward to" },
{ "S", "<Plug>(leap-backward)", mode = { "n", "x", }, desc = "Leap backward to" },
{ "z", "<Plug>(leap-forward-till)", mode = "o", desc = "Leap forward to" },
{ "Z", "<Plug>(leap-backward)", mode = "o", desc = "Leap backward to" },
},
},
@@ -44,10 +44,36 @@ return {
"tpope/vim-sleuth",
{
"kylechui/nvim-surround",
version = "*",
event = "VeryLazy",
config = true,
"echasnovski/mini.surround",
opts = {
mappings = {
add = "ys",
replace = "cs",
delete = "ds",
find = '',
find_left = '',
highlight = '',
update_n_lines = '',
suffix_last = 'l',
suffix_next = 'n',
},
custom_surroundings = {
B = { output = { left = "{", right = "}" } },
},
},
config = function(_, opts)
require("mini.surround").setup(opts)
vim.keymap.del('x', 'ys')
vim.keymap.set('x', 'S', [[:<C-u>lua MiniSurround.add('visual')<CR>]], { silent = true })
vim.keymap.set('n', 'yss', 'ys_', { remap = true })
end,
keys = {
{ "ys", desc = "Add surrounding" },
{ "cs", desc = "Change surroundings" },
{ "ds", desc = "Delete surroundings" },
},
},
{
@@ -59,10 +85,17 @@ return {
},
{
"vim-scripts/ReplaceWithRegister",
"echasnovski/mini.operators",
opts = {
replace = {
prefix = "cr",
reindent_linewise = true,
},
},
keys = {
{ "cr", "<Plug>ReplaceWithRegisterOperator", desc = "Replace with register" },
{ "<leader>cr", '"+<Plug>ReplaceWithRegisterOperator', desc = "Replace with system clipboard" },
{ "gx" },
{ "cr", desc = "Replace with register" },
{ "<leader>cr", '"+cr', desc = "Replace with system clipboard" },
},
},
@@ -86,7 +119,6 @@ return {
{ "gA", desc = "Align with preview" }
},
config = true,
version = '*',
},
{
modules/cli/nvim/lua/plugins/treesiter.lua
+12 -19
View File
@@ -4,9 +4,6 @@ return {
version = false,
build = ":TSUpdate",
event = { "BufReadPost", "BufWritePost", "BufNewFile" },
dependencies = {
"nvim-treesitter/nvim-treesitter-textobjects"
},
opts = {
highlight = {
enable = true,
@@ -15,21 +12,6 @@ return {
indent = { enable = true },
ensure_installed = "all",
sync_install = false,
textobjects = {
select = {
enable = true,
lookahead = false,
keymaps = {
["af"] = "@function.outer",
["if"] = "@function.inner",
["ac"] = "@class.outer",
["ic"] = "@class.inner",
["ia"] = "@parameter.inner",
["aa"] = "@parameter.outer",
},
},
},
matchup = { enable = true },
},
main = "nvim-treesitter.configs",
@@ -71,5 +53,16 @@ return {
config = function()
vim.keymap.del("o", "z%")
end
}
},
{
"echasnovski/mini.ai",
opts = {
custom_textobjects = {
B = { { "%b{}" }, "^.().*().$" }
},
n_lines = 500,
},
event = "VeryLazy",
},
}
modules/cli/nvim/lua/plugins/ui.lua
+1 -4
View File
@@ -150,7 +150,7 @@ return {
},
user_default_options = {
mode = "virtualtext",
RGB = true,
RGB = false,
RRGGBB = true,
names = false,
RRGGBBAA = true,
@@ -230,9 +230,6 @@ return {
dependencies = "nvim-lua/plenary.nvim",
config = true,
event = "VeryLazy",
keys = {
{ "<leader>t", "<cmd>TodoQuickFix<cr>", desc = "Open todo list" },
}
},
{