Compare commits

6 Commits

6 changed files with 77 additions and 30 deletions

View File

@@ -1,8 +1,8 @@
MiniDeps.later(function()
MiniDeps.add("ibhagwan/fzf-lua")
local fzf = require("fzf-lua")
fzf.setup({
local fzf_lua = require("fzf-lua")
fzf_lua.setup({
files = {
no_ignore = true,
toggle_ignore_flag = "--no-ignore-vcs",
@@ -13,11 +13,12 @@ MiniDeps.later(function()
},
})
vim.keymap.set("n", "<leader>sf", fzf.files)
vim.keymap.set("n", "<leader>sg", fzf.live_grep)
vim.keymap.set("n", "<leader>sw", fzf.grep_cword)
vim.keymap.set("v", "<leader>sg", fzf.grep_visual)
vim.keymap.set("n", "<leader>sr", fzf.resume)
vim.keymap.set("n", "<leader>sb", fzf.builtin)
vim.keymap.set("n", "<leader>sf", fzf_lua.files)
vim.keymap.set("n", "<leader>sg", fzf_lua.live_grep)
vim.keymap.set("n", "<leader>sw", fzf_lua.grep_cword)
vim.keymap.set("v", "<leader>sg", fzf_lua.grep_visual)
vim.keymap.set("n", "<leader>sj", fzf_lua.jumps)
vim.keymap.set("n", "<leader>sh", fzf_lua.helptags)
vim.keymap.set("n", "<leader>sr", fzf_lua.resume)
vim.keymap.set("n", "<leader>sb", fzf_lua.builtin)
end)

View File

@@ -11,10 +11,10 @@ MiniDeps.later(function()
})
-- blame
vim.keymap.set({"n", "v"}, "<leader>gb", ":Gitsigns blame<CR>")
vim.keymap.set({"n", "v"}, "<leader>gt", ":Gitsigns blame_line<CR>")
vim.keymap.set({ "n", "v" }, "<leader>gb", ":Gitsigns blame<CR>")
vim.keymap.set({ "n", "v" }, "<leader>gt", ":Gitsigns blame_line<CR>")
-- hunks
vim.keymap.set({"n", "v"}, "<leader>ga", ":Gitsigns stage_hunk<CR>")
vim.keymap.set({"n", "v"}, "<leader>gr", ":Gitsigns reset_hunk<CR>")
vim.keymap.set({ "n", "v" }, "<leader>ga", ":Gitsigns stage_hunk<CR>")
vim.keymap.set({ "n", "v" }, "<leader>gr", ":Gitsigns reset_hunk<CR>")
end)

View File

@@ -1 +0,0 @@
MiniDeps.later(function() require("mini.pairs").setup() end)

View File

@@ -12,25 +12,67 @@ local function reinstall_treesitter()
ts.install(ts.get_installed(), { force = true })
end
local function deps_section()
-- get working dir
-- get config dir
local mini_deps = require("mini.deps")
local nr_deps = #vim.iter(mini_deps):enumerate():totable()
local items = {
{
name = "number of dependencies " .. nr_deps,
action = "",
section = "dependencies",
},
}
local function mk_dep_item(name, action)
return { name = name, action = action, section = "dependencies" }
end
local deps_actions = {
mk_dep_item("update dependencies", "DepsUpdate"),
mk_dep_item("snap dependencies", "DepsSnapSave"),
mk_dep_item("load dependencies", "DepsSnapLoad"),
mk_dep_item("clean dependencies", "DepsClean"),
}
vim.notify(vim.fn.getcwd())
vim.notify(vim.fn.stdpath("config"))
vim.notify(tostring(vim.fn.stdpath("config") == vim.fn.getcwd()))
if vim.fn.getcwd() == vim.fn.stdpath("config") then
for _, item in ipairs(deps_actions) do
table.insert(items, item)
end
end
return items
end
MiniDeps.now(function()
local builtins = {
{ name = "edit new buffer", action = "enew", section = "builtin actions" },
{ name = "quit neovim", action = "qall", section = "builtin actions" },
}
require("mini.starter").setup({
query_updaters = "abcdefghijklmnopqrstuvwxyz0123456789_.",
evaluate_single = true,
header = default_header,
footer = "",
items = {
--stylua: ignore start
-- builtins
{ name = "edit new buffer", action = "enew", section = "builtin actions" },
{ name = "quit neovim", action = "qall", section = "builtin actions" },
builtins,
-- dependencies
{ name = "update dependencies", action = "DepsUpdate", section = "dependencies" },
{ name = "snap dependencies", action = "DepsSnapSave", section = "dependencies" },
{ name = "load dependencies", action = "DepsSnapLoad", section = "dependencies" },
{ name = "clean dependencies", action = "DepsClean", section = "dependencies" },
deps_section,
-- debug
{ name = "reinstall treesitter parsers", action = reinstall_treesitter, section = "debug" },
--stylua: ignore end
{
name = "reinstall treesitter parsers",
action = reinstall_treesitter,
section = "debug",
},
},
})
end)

View File

@@ -0,0 +1,4 @@
MiniDeps.later(function()
MiniDeps.add("windwp/nvim-autopairs")
require("nvim-autopairs").setup()
end)

View File

@@ -1,15 +1,16 @@
return {
["copilot.vim"] = "da369d90cfd6c396b1d0ec259836a1c7222fb2ea",
["fzf-lua"] = "db3ccffe79480543d8e0f7b0cac0d9b220f9486e",
["fzf-lua"] = "6bb2a266facf0d16e30371b6b433037d1828a674",
["gitlinker.nvim"] = "cc59f732f3d043b626c8702cb725c82e54d35c25",
["gitsigns.nvim"] = "1ee5c1fd068c81f9dd06483e639c2aa4587dc197",
["gitsigns.nvim"] = "20ad4419564d6e22b189f6738116b38871082332",
["gruvbox-material"] = "834dbf21836862300ced7444db4262b796330ab7",
["guess-indent.nvim"] = "84a4987ff36798c2fc1169cbaff67960aed9776f",
["mini.nvim"] = "5e1dd6e3d5f758eccf6c51461559da785dba688c",
["nvim-lspconfig"] = "ac98db2f9f06a56498ec890a96928774eae412c3",
["nvim-treesitter"] = "0606c7a9dcaa5c5beee0b0f09043e9fdd1ba0a68",
["oil.nvim"] = "919e155fdf38e9148cdb5304faaaf53c20d703ea",
["mini.nvim"] = "d1a91582bf2d16026ae84292874c70fb2d0ffe42",
["nvim-autopairs"] = "7a2c97cccd60abc559344042fefb1d5a85b3e33b",
["nvim-lspconfig"] = "a9b2fb560c4ab22c10728fd5149dbd7b62aa4f69",
["nvim-treesitter"] = "738d9ced4ce5b4538c3a0e23ceca12c34c8d2e74",
["oil.nvim"] = "7e1cd7703ff2924d7038476dcbc04b950203b902",
["plenary.nvim"] = "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
["rainbow-delimiters.nvim"] = "3277ad5f96eb03c9d618c88e24f683e4364e578c",
["rainbow-delimiters.nvim"] = "b6b3c9e3f8db02a56416b8ee25d3dbd079ebf26b",
["todo-comments.nvim"] = "19d461ddd543e938eb22505fb03fa878800270b6"
}