From 51e6343b9e462ec01dcf55d43544c65c232f0010 Mon Sep 17 00:00:00 2001 From: js0ny Date: Mon, 17 Nov 2025 15:31:52 +0000 Subject: [PATCH] nvim: delete unused lua files --- home/dot_config/nvim/dot_editorconfig | 12 -- home/dot_config/nvim/lua/keymaps/language.lua | 36 ---- home/dot_config/nvim/lua/keymaps/leaders.bak | 194 ------------------ home/dot_config/nvim/lua/keymaps/leaders.lua | 28 +-- home/dot_config/nvim/lua/keymaps/lspkeys.lua | 31 +-- home/dot_config/nvim/lua/keymaps/modifier.lua | 7 +- .../dot_config/nvim/lua/keymaps/nvim-tree.lua | 87 -------- .../nvim/lua/keymaps/user-command.lua | 24 +++ .../nvim/lua/keymaps/visual-multi.lua | 9 - home/dot_config/nvim/lua/plugins/dap.lua | 1 + home/dot_config/nvim/lua/plugins/edit.lua | 3 +- .../nvim/lua/plugins/mod/alpha-nvim.lua | 55 ----- .../nvim/lua/plugins/mod/hover-nvim.lua | 58 ------ .../nvim/lua/plugins/mod/image-nvim.lua | 22 -- .../nvim/lua/plugins/mod/nvim-cmp.lua | 111 ---------- .../nvim/lua/plugins/mod/nvim-lspconfig.lua | 40 ---- .../nvim/lua/plugins/mod/nvim-tree.lua | 53 ----- .../nvim/lua/plugins/mod/telescope.lua | 52 ----- 18 files changed, 42 insertions(+), 781 deletions(-) delete mode 100644 home/dot_config/nvim/dot_editorconfig delete mode 100644 home/dot_config/nvim/lua/keymaps/language.lua delete mode 100644 home/dot_config/nvim/lua/keymaps/leaders.bak delete mode 100644 home/dot_config/nvim/lua/keymaps/nvim-tree.lua delete mode 100644 home/dot_config/nvim/lua/keymaps/visual-multi.lua delete mode 100644 home/dot_config/nvim/lua/plugins/mod/alpha-nvim.lua delete mode 100644 home/dot_config/nvim/lua/plugins/mod/hover-nvim.lua delete mode 100644 home/dot_config/nvim/lua/plugins/mod/image-nvim.lua delete mode 100644 home/dot_config/nvim/lua/plugins/mod/nvim-cmp.lua delete mode 100644 home/dot_config/nvim/lua/plugins/mod/nvim-lspconfig.lua delete mode 100644 home/dot_config/nvim/lua/plugins/mod/nvim-tree.lua delete mode 100644 home/dot_config/nvim/lua/plugins/mod/telescope.lua diff --git a/home/dot_config/nvim/dot_editorconfig b/home/dot_config/nvim/dot_editorconfig deleted file mode 100644 index f9b0405..0000000 --- a/home/dot_config/nvim/dot_editorconfig +++ /dev/null @@ -1,12 +0,0 @@ -[*] -indent_style = space -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.lua] -indent_type = "Spaces" -indent_width = 2 -column_width = 120 diff --git a/home/dot_config/nvim/lua/keymaps/language.lua b/home/dot_config/nvim/lua/keymaps/language.lua deleted file mode 100644 index 8e4203d..0000000 --- a/home/dot_config/nvim/lua/keymaps/language.lua +++ /dev/null @@ -1,36 +0,0 @@ -local M = {} - --- Markdown - -local function set_markdown_keymaps(bufnr) - local markdown_opt = { noremap = true, silent = true, buffer = bufnr } - for _, map in ipairs(M.markdown) do - local opts = vim.tbl_extend("force", markdown_opt, map.opts or {}) - vim.keymap.set(map.mode, map.keys, map.cmd, opts) - end -end - -M.markdown = { - { mode = "v", keys = "`", cmd = "c`pi`", desc = "Wrap selection in ` for inline code" }, - { mode = "v", keys = "*", cmd = "c**pi**", desc = "Wrap selection in ** for bold" }, - { mode = "v", keys = "_", cmd = "c*pi*", desc = "Wrap selection in * for italic" }, -} - -vim.api.nvim_create_autocmd("FileType", { - pattern = "markdown", - callback = function() - set_markdown_keymaps(0) - vim.opt_local.shiftwidth = 2 - vim.opt_local.tabstop = 2 - end, -}) - -vim.api.nvim_create_autocmd("FileType", { - pattern = "nix", - callback = function() - vim.opt_local.shiftwidth = 2 - vim.opt_local.tabstop = 2 - end, -}) - -return M diff --git a/home/dot_config/nvim/lua/keymaps/leaders.bak b/home/dot_config/nvim/lua/keymaps/leaders.bak deleted file mode 100644 index 0c69dba..0000000 --- a/home/dot_config/nvim/lua/keymaps/leaders.bak +++ /dev/null @@ -1,194 +0,0 @@ -local M = {} - -local formatFx = function() - require("conform").format({ async = true }) -end - -local renameCurrentBuffer = function() - local old_name = vim.fn.expand("%:p") - local new_name = vim.fn.input("New name: ", vim.fn.expand("%:p:h") .. "/") - - if new_name == "" then - print("No new name provided") - return - elseif new_name == old_name then - return - end - - vim.cmd("write") - - local success, err = os.rename(old_name, new_name) - if not success then - print("Error renaming file: " .. err) - return - end - - vim.cmd("edit " .. new_name) - vim.cmd("bdelete " .. old_name) -end - --- 通用映射函数 -local function apply_mappings(maps, prefix) - for _, map in ipairs(maps) do - local new_map = { - keys = prefix .. map.keys, - cmd = map.cmd, - opts = map.opts, - } - table.insert(M, new_map) - end -end -vim.api.nvim_create_user_command("Rename", renameCurrentBuffer, {}) - -local leader_mappings = { - general = { - { keys = "", cmd = ":Telescope find_files", opts = { desc = "Find Files" } }, - { keys = "/", cmd = ":Telescope live_grep", opts = { desc = "Grep Files" } }, - { keys = "-", cmd = ":split", opts = { desc = "Split to down" } }, - { keys = "\\", cmd = ":vsplit", opts = { desc = "Split to right" } }, - { keys = "|", cmd = ":vsplit", opts = { desc = "Split to right" } }, - { keys = "h", cmd = "h", opts = { desc = "Left Window" } }, - { keys = "n", cmd = "j", opts = { desc = "Down Window" } }, - { keys = "e", cmd = "k", opts = { desc = "Up Window" } }, - { keys = "i", cmd = "l", opts = { desc = "Right Window" } }, - { keys = "F", cmd = ":NvimTreeFindFileToggle", opts = { desc = "Toggle File Explorer" } }, - { keys = "", cmd = "b#", opts = { desc = "Switch to last buffer" } }, - { keys = "!", cmd = ":FloatermToggle", opts = { desc = "Toggle Terminal" } }, - { keys = '"', cmd = ":!wezterm-gui &", pots = { desc = "Open External Terminal(wezterm)" } }, - { keys = ";", cmd = ":Telescope", pots = { desc = "Show Telescope Commands" } }, - }, - b = { -- +buffer - { keys = "0", cmd = "b#", opts = { desc = "Switch to last buffer" } }, - { keys = "1", cmd = ":BufferLineGotoBuffer 1", opts = { desc = "Switch to Buffer #1" } }, - { keys = "2", cmd = ":BufferLineGotoBuffer 2", opts = { desc = "Switch to Buffer #2" } }, - { keys = "3", cmd = ":BufferLineGotoBuffer 3", opts = { desc = "Switch to Buffer #3" } }, - { keys = "4", cmd = ":BufferLineGotoBuffer 4", opts = { desc = "Switch to Buffer #4" } }, - { keys = "5", cmd = ":BufferLineGotoBuffer 5", opts = { desc = "Switch to Buffer #5" } }, - { keys = "6", cmd = ":BufferLineGotoBuffer 6", opts = { desc = "Switch to Buffer #6" } }, - { keys = "7", cmd = ":BufferLineGotoBuffer 7", opts = { desc = "Switch to Buffer #7" } }, - { keys = "8", cmd = ":BufferLineGotoBuffer 8", opts = { desc = "Switch to Buffer #8" } }, - { keys = "9", cmd = ":BufferLineGotoBuffer 9", opts = { desc = "Switch to Buffer #9" } }, - { keys = "a", cmd = ":Alpha", opts = { desc = "Dashboard" } }, - { keys = "b", cmd = ":BufferLinePick", opts = { desc = "Quick Switch Buffers" } }, - { keys = "B", cmd = ":Telescope buffers", opts = { desc = "List Buffers" } }, - { keys = "d", cmd = ":bdelete", opts = { desc = "Delete Buffer" } }, - { keys = "D", cmd = ":BufferLineCloseOthers", opts = { desc = "Delete Other Buffers" } }, - { keys = "xx", cmd = ":BufferLineCloseOthers", opts = { desc = "Delete Other Buffers" } }, - { keys = "xh", cmd = ":BufferLineCloseLeft", opts = { desc = "Delete Buffers Left" } }, - { keys = "xi", cmd = ":BufferLineCloseRight", opts = { desc = "Delete Buffers Right" } }, - { keys = "X", cmd = ":BufferLineCloseOthers", opts = { desc = "Delete Other Buffers" } }, - { keys = "h", cmd = ":bprevious", opts = { desc = "Previous Buffer" } }, - { keys = "i", cmd = ":bnext", opts = { desc = "Next Buffer" } }, - { keys = "H", cmd = ":bfirst", opts = { desc = "First Buffer" } }, - { keys = "I", cmd = ":blast", opts = { desc = "Last Buffer" } }, - { keys = "0", cmd = ":bfirst", opts = { desc = "First Buffer" } }, - { keys = "^", cmd = ":bfirst", opts = { desc = "First Buffer" } }, - { keys = "$", cmd = ":blast", opts = { desc = "Last Buffer" } }, - { keys = "s", cmd = ":new", opts = { desc = "Scratch buffers" } }, - { keys = "t", cmd = ":BufferLineTogglePin", opts = { desc = "Pin Buffer" } }, - { keys = "y", cmd = ":%y+", opts = { desc = "Copy Buffer to Clipboard" } }, - }, - c = { -- +code/compile - { keys = "r", cmd = ":RunCode", opts = { desc = "Run code" } }, - { keys = "R", cmd = vim.lsp.buf.rename, opts = { desc = "Rename symbol under cursor" } }, - { keys = "e", cmd = ":Telescope diagnostics", opts = { desc = "Navigate errors/warnings" } }, - { keys = "f", cmd = formatFx, opts = { desc = "Format buffer" } }, - { keys = "s", cmd = ":Telescope treesitter", opts = { desc = "Search symbols" } }, - { keys = "S", cmd = ":Telescope grep_string", opts = { desc = "Search current symbol" } }, - }, - f = { -- +file/find - { keys = "f", cmd = ":Telescope fd", opts = { desc = "Find Files" } }, - { keys = "F", cmd = ":GrugFar", opts = { desc = "Search & Replace" } }, - { keys = "l", cmd = ":set filetype=", opts = { desc = "Set Filetype to ..." } }, - { keys = "n", cmd = ":new", opts = { desc = "New File" } }, - { keys = "s", cmd = ":write", opts = { desc = "Save File" } }, - { keys = "S", cmd = ":wall", opts = { desc = "Save All Files" } }, - { keys = "b", cmd = ":Telescope buffers", opts = { desc = "List Buffers" } }, - { keys = "D", cmd = "!trash-rm %", opts = { desc = "Delete current file" } }, - { keys = "t", cmd = ":NvimTreeFindFileToggle", opts = { desc = "Toggle File Tree" } }, - { keys = "T", cmd = ":FloatermNew", opts = { desc = "Spawn a float terminal" } }, - { keys = "h", cmd = ":Telescope oldfiles", opts = { desc = "Search history files" } }, - { keys = "c", cmd = ":Telescope find_files cwd=~/.config/nvim", opts = { desc = "Search Config" } }, - { keys = "o", cmd = ":!open %", opts = { desc = "Open file in default program" } }, - { keys = "R", cmd = renameCurrentBuffer, opts = { desc = "Rename current file" } }, - { keys = "x", cmd = ":Lazy", opts = { desc = "Open extension view" } }, - { keys = "yy", cmd = ":let @+ = expand('%:p')", opts = { desc = "Copy file path" } }, - { keys = "yY", cmd = ":let @+ = expand('%')", opts = { desc = "Copy relative file path" } }, - { keys = "yn", cmd = ":let @+ = expand('%:t')", opts = { desc = "Copy file name" } }, - { keys = "yN", cmd = ":let @+ = expand('%:t:r')", opts = { desc = "Copy file name without extension" } }, - { keys = "yd", cmd = ":let @+ = expand('%:p:h')", opts = { desc = "Copy directory path" } }, - { - keys = "yl", - cmd = ":let @+ = expand('%:p') . ':' . line('.')", - opts = { desc = "Copy file path with line number" }, - }, - { - keys = "yL", - cmd = ":let @+ = expand('%') . ':' . line('.')", - opts = { desc = "Copy relative file path with line number" }, - }, - }, - g = { -- +git/version control - { keys = "g", cmd = ":LazyGit", opts = { desc = "Toggle LazyGit" } }, - { keys = "c", cmd = ":Telescope git_commits", opts = { desc = "Show commits" } }, - { keys = "b", cmd = ":Gitsigns blame", opts = { desc = "Blame file" } }, - { keys = "d", cmd = ":Gitsigns diffthis", opts = { desc = "Diff file" } }, - { keys = "B", cmd = ":Gitsigns toggle_current_line_blame", opts = { desc = "Toggle line blame" } }, - { keys = "s", cmd = ":Telescope git_status", opts = { desc = "Git Status" } }, - { keys = "t", cmd = ":Telescope git_branches", opts = { desc = "Git Branches" } }, - }, - j = { -- +lsp - { keys = "r", cmd = vim.lsp.buf.references, opts = { desc = "Show current reference" } }, - }, - p = { -- +project - { keys = "p", cmd = ":Telescope projects", opts = { desc = "List all Projects" } }, - { keys = "g", cmd = ":Telescope projects", opts = { desc = "List all Git Projects" } }, - { keys = "s", cmd = ":Telescope session-lens", opts = { desc = "List all sessions" } }, - }, - q = { -- +quit - { keys = "q", cmd = ":q", opts = { desc = "Quit" } }, - { keys = "Q", cmd = ":qa!", opts = { desc = "Force Quit" } }, - { keys = "w", cmd = ":wq", opts = { desc = "Write and Quit" } }, - { keys = "W", cmd = ":wall:qa!", opts = { desc = "Write all and Force Quit" } }, - }, - t = { -- +toggle/test - { keys = "f", cmd = ":NvimTreeToggle", opts = { desc = "Toggle File Explorer" } }, - { keys = "F", cmd = ":FormatToggle", opts = { desc = "Toggle autoformat-on-save" } }, - { keys = "t", cmd = ":FloatermToggle", opts = { desc = "toggle visibility of the float terminal" } }, - }, - u = { -- +ui - { keys = "i", cmd = ":Telescope colorscheme", opts = { desc = "Change colorscheme" } }, - { keys = " ", cmd = ":set list!", opts = { desc = "Toggle show all symbols" } }, - }, - w = { -- +window - { keys = "h", cmd = "h", opts = { desc = "Left Window" } }, - { keys = "n", cmd = "j", opts = { desc = "Down Window" } }, - { keys = "e", cmd = "k", opts = { desc = "Up Window" } }, - { keys = "i", cmd = "l", opts = { desc = "Right Window" } }, - { keys = "H", cmd = "H", opts = { desc = "Move Window Left" } }, - { keys = "N", cmd = "J", opts = { desc = "Move Window Down" } }, - { keys = "E", cmd = "K", opts = { desc = "Move Window Up" } }, - { keys = "I", cmd = "L", opts = { desc = "Move Window Right" } }, - { keys = "-", cmd = ":split", opts = { desc = "Split to down" } }, - { keys = "|", cmd = ":vsplit", opts = { desc = "Split to right" } }, - { keys = "/", cmd = ":vsplit", opts = { desc = "Split to right" } }, - { keys = "d", cmd = "c", opts = { desc = "Close Window" } }, - { keys = "D", cmd = "o", opts = { desc = "Close Other Windows" } }, - { keys = "r", cmd = "r", opts = { desc = "Rotate Windows" } }, - { keys = "R", cmd = "R", opts = { desc = "Reverse Rotate Windows" } }, - { keys = "t", cmd = "T", opts = { desc = "Move Window to New Tab" } }, - { keys = "]", cmd = ":resize +5", opts = { desc = "Increase Window Size" } }, - { keys = "[", cmd = ":resize -5", opts = { desc = "Decrease Window Size" } }, - { keys = "M", cmd = ":resize:vertical resize", opts = { desc = "Maximize window size" } }, - }, -} - -for key, maps in pairs(leader_mappings) do - if key == "general" then - apply_mappings(maps, "") - else - apply_mappings(maps, "" .. key) - end -end - -return M diff --git a/home/dot_config/nvim/lua/keymaps/leaders.lua b/home/dot_config/nvim/lua/keymaps/leaders.lua index 27aa3a6..abb938b 100644 --- a/home/dot_config/nvim/lua/keymaps/leaders.lua +++ b/home/dot_config/nvim/lua/keymaps/leaders.lua @@ -4,29 +4,6 @@ local formatFx = function() require("conform").format({ async = true }) end -local renameCurrentBuffer = function() - local old_name = vim.fn.expand("%:p") - local new_name = vim.fn.input("New name: ", vim.fn.expand("%:p:h") .. "/") - - if new_name == "" then - print("No new name provided") - return - elseif new_name == old_name then - return - end - - vim.cmd("write") - - local success, err = os.rename(old_name, new_name) - if not success then - print("Error renaming file: " .. err) - return - end - - vim.cmd("edit " .. new_name) - vim.cmd("bdelete " .. old_name) -end - -- 通用映射函数 local function apply_mappings(maps, prefix) for _, map in ipairs(maps) do @@ -38,8 +15,8 @@ local function apply_mappings(maps, prefix) table.insert(M, new_map) end end -vim.api.nvim_create_user_command("Rename", renameCurrentBuffer, {}) +-- stylua: ignore start local leader_mappings = { general = { { keys = "-", cmd = ":split", opts = { desc = "Split to down" } }, @@ -92,7 +69,7 @@ local leader_mappings = { { keys = "D", cmd = "!trash-rm %", opts = { desc = "Delete current file" } }, -- { keys = "t", cmd = ":NvimTreeFindFileToggle", opts = { desc = "Toggle File Tree" } }, -- { keys = "o", cmd = ":!open %", opts = { desc = "Open file in default program" } }, - { keys = "R", cmd = renameCurrentBuffer, opts = { desc = "Rename current file" } }, + { keys = "R", cmd = "Rename", opts = { desc = "Rename current file" } }, { keys = "x", cmd = ":Lazy", opts = { desc = "Open extension view" } }, { keys = "yy", cmd = ":let @+ = expand('%:p')", opts = { desc = "Copy file path" } }, { keys = "yY", cmd = ":let @+ = expand('%')", opts = { desc = "Copy relative file path" } }, @@ -152,6 +129,7 @@ local leader_mappings = { { keys = "M", cmd = ":resize:vertical resize", opts = { desc = "Maximize window size" } }, }, } +-- stylua: ignore end for key, maps in pairs(leader_mappings) do if key == "general" then diff --git a/home/dot_config/nvim/lua/keymaps/lspkeys.lua b/home/dot_config/nvim/lua/keymaps/lspkeys.lua index e972217..fdba2a7 100644 --- a/home/dot_config/nvim/lua/keymaps/lspkeys.lua +++ b/home/dot_config/nvim/lua/keymaps/lspkeys.lua @@ -1,26 +1,17 @@ +-- stylua: ignore start local M = { - { keys = "gd", cmd = vim.lsp.buf.definition, opts = { desc = "Goto Definition" } }, - { keys = "", cmd = vim.lsp.buf.definition, opts = { desc = "Goto Definition" } }, - { keys = "gD", cmd = vim.lsp.buf.declaration, opts = { desc = "Goto Declaration" } }, - { keys = "gr", cmd = vim.lsp.buf.references, opts = { desc = "Goto References" } }, - { keys = "gi", cmd = vim.lsp.buf.implementation, opts = { desc = "Goto Implementation" } }, - { keys = ",", cmd = vim.lsp.buf.code_action, opts = { desc = "Code Action" } }, - { keys = "ga", cmd = vim.lsp.buf.code_action, opts = { desc = "Code Action" } }, - { keys = "gh", cmd = vim.lsp.buf.hover, opts = { desc = "Show hover" } }, + { keys = "gd", cmd = vim.lsp.buf.definition, opts = { desc = "Goto Definition" } }, + { keys = "", cmd = vim.lsp.buf.definition, opts = { desc = "Goto Definition" } }, + { keys = "gD", cmd = vim.lsp.buf.declaration, opts = { desc = "Goto Declaration" } }, + { keys = "gr", cmd = vim.lsp.buf.references, opts = { desc = "Goto References" } }, + { keys = "gi", cmd = vim.lsp.buf.implementation, opts = { desc = "Goto Implementation" } }, + { keys = ",", cmd = vim.lsp.buf.code_action, opts = { desc = "Code Action" } }, + { keys = "ga", cmd = vim.lsp.buf.code_action, opts = { desc = "Code Action" } }, + { keys = "gh", cmd = vim.lsp.buf.hover, opts = { desc = "Show hover" } }, -- [c]hange [d]efinition - { keys = "cd", cmd = vim.lsp.buf.rename, opts = { desc = "Rename symbol under cursor" } }, + { keys = "cd", cmd = vim.lsp.buf.rename, opts = { desc = "Rename symbol under cursor" } }, } - --- local function smart_split_definition() --- local width = vim.api.nvim_win_get_width(0) --- if width > 80 then -- Adjust 80 to your preference --- vim.api.nvim_command("vsp") --- else --- vim.api.nvim_command("sp") --- end --- vim.lsp.buf.definition() --- end --- vim.keymap.set("n", "d", smart_split_definition, { desc = "Go to Definition (Smart Split)" }) +-- stylua: ignore end local function smart_split(func) local width = vim.api.nvim_win_get_width(0) diff --git a/home/dot_config/nvim/lua/keymaps/modifier.lua b/home/dot_config/nvim/lua/keymaps/modifier.lua index 2987d12..ec66d01 100644 --- a/home/dot_config/nvim/lua/keymaps/modifier.lua +++ b/home/dot_config/nvim/lua/keymaps/modifier.lua @@ -1,10 +1,5 @@ local keymaps_modifier = { - -- Use C-w to move between windows - -- { keys = "h", cmd = "h", opts = { desc = "left Window" } }, - -- { keys = "n", cmd = "j", opts = { desc = "Down Window" } }, - -- { keys = "e", cmd = "k", opts = { desc = "Up Window" } }, - -- { keys = "i", cmd = "l", opts = { desc = "Right Window" } }, - { keys = "", cmd = "FzfLua commands", opts = { desc = "Commands" } }, + { keys = "", cmd = "FzfLua commands", opts = { desc = "Commands" } }, } return keymaps_modifier diff --git a/home/dot_config/nvim/lua/keymaps/nvim-tree.lua b/home/dot_config/nvim/lua/keymaps/nvim-tree.lua deleted file mode 100644 index 03192d4..0000000 --- a/home/dot_config/nvim/lua/keymaps/nvim-tree.lua +++ /dev/null @@ -1,87 +0,0 @@ -local M = {} - -M.event = "BufEnter" - -M.global = { - { mode = "n", keys = "E", cmd = ":NvimTreeToggle" }, - { mode = "n", keys = "", cmd = ":NvimTreeFindFileToggle" }, -} - -function M.plugin(api, opts) - -- mode is set to "n" by default, in `./lua/plugins/nvim-tree.lua` - return { - -- Toggle - { keys = "e", cmd = ":NvimTreeToggle", opts = opts("Toggle") }, - -- Arrow 箭头 hnei - { keys = "h", cmd = api.node.navigate.parent_close, opts = opts("Close node") }, - { keys = "i", cmd = api.node.open.edit, opts = opts("Open") }, - { keys = "H", cmd = api.tree.toggle_hidden_filter, opts = opts("Toggle Dotfiles") }, - { keys = "N", cmd = api.node.navigate.sibling.next, opts = opts("Next Sibling") }, - { keys = "E", cmd = api.node.navigate.sibling.prev, opts = opts("Previous Sibling") }, - { keys = "I", cmd = api.tree.toggle_gitignore_filter, opts = opts("Toggle GitIgnored") }, - -- CONTROL KEYS 控制键 - { keys = "", cmd = api.node.navigate.parent_close, opts = opts("Close node") }, - { keys = "", cmd = api.node.open.edit, opts = opts("Open") }, - { keys = "", cmd = api.node.open.preview, opts = opts("Open Preview") }, - -- Alpha 字母键 - { keys = "a", cmd = api.fs.create, opts = opts("Create") }, - { keys = "A", cmd = api.fs.create, opts = opts("Create") }, - { keys = "bd", cmd = api.marks.bulk.delete, opts = opts("Delete Bookmarked") }, - { keys = "bt", cmd = api.marks.bulk.trash, opts = opts("Trash Bookmarked") }, - { keys = "bmv", cmd = api.marks.bulk.move, opts = opts("Move Bookmarked") }, - { keys = "B", cmd = api.tree.toggle_no_buffer_filter, opts = opts("Toggle Filter: No Buffer") }, - { keys = "c", cmd = api.fs.copy.node, opts = opts("Copy") }, - { keys = "C", cmd = api.fs.copy.filename, opts = opts("Copy") }, - { keys = "d", cmd = api.fs.remove, opts = opts("Delete") }, - { keys = "D", cmd = api.fs.trash, opts = opts("Trash") }, - { keys = "]e", cmd = api.node.navigate.diagnostics.next, opts = opts("Next Diagnostic") }, - { keys = "[e", cmd = api.node.navigate.diagnostics.prev, opts = opts("Prev Diagnostic") }, - { keys = "F", cmd = api.live_filter.clear, opts = opts("Live Filter: Clear") }, - { keys = "f", cmd = api.live_filter.start, opts = opts("Live Filter: Start") }, - { keys = "[g", cmd = api.node.navigate.git.prev, opts = opts("Prev Git") }, - { keys = "]g", cmd = api.node.navigate.git.next, opts = opts("Next Git") }, - { keys = "L", cmd = api.node.open.toggle_group_empty, opts = opts("Toggle Group Empty") }, - { keys = "M", cmd = api.tree.toggle_no_bookmark_filter, opts = opts("Toggle Filter: No Bookmark") }, - { keys = "m", cmd = api.marks.toggle, opts = opts("Toggle Bookmark") }, - { keys = "o", cmd = api.node.open.edit, opts = opts("Open") }, - { keys = "O", cmd = api.node.open.no_window_picker, opts = opts("Open: No Window Picker") }, - { keys = "p", cmd = api.fs.paste, opts = opts("Paste") }, - { keys = "P", cmd = api.node.navigate.parent, opts = opts("Parent Directory") }, - { keys = "q", cmd = api.tree.close, opts = opts("Close") }, - { keys = "r", cmd = api.fs.rename, opts = opts("Rename") }, - { keys = "R", cmd = api.tree.reload, opts = opts("Refresh") }, - { keys = "s", cmd = api.node.run.system, opts = opts("Run System") }, - { keys = "S", cmd = api.tree.search_node, opts = opts("Search") }, - { keys = "u", cmd = api.fs.rename_full, opts = opts("Rename: Full Path") }, - { keys = "U", cmd = api.tree.toggle_custom_filter, opts = opts("Toggle Filter: Hidden") }, - { keys = "W", cmd = api.tree.collapse_all, opts = opts("Collapse") }, - { keys = "x", cmd = api.fs.cut, opts = opts("Cut") }, - { keys = "y", cmd = api.fs.copy.relative_path, opts = opts("Copy Relative Path") }, - { keys = "Y", cmd = api.fs.copy.absolute_path, opts = opts("Copy Absolute Path") }, - -- From Directory Opus - { keys = "#", cmd = "set relativenumber!", opts = opts("Toggle Relative Number") }, - -- Numeric 数字键 - { keys = "!", cmd = api.node.run.cmd, opts = opts("Run Command") }, - -- Non-Alphanumeric 非字母数字键 - { keys = "?", cmd = api.tree.toggle_help, opts = opts("Help") }, - { keys = ">", cmd = api.node.navigate.sibling.next, opts = opts("Next Sibling") }, - { keys = "<", cmd = api.node.navigate.sibling.prev, opts = opts("Previous Sibling") }, - { keys = ".", cmd = api.node.run.cmd, opts = opts("Run Command") }, - { keys = ";", cmd = api.node.run.cmd, opts = opts("Run Command") }, - { keys = "-", cmd = api.tree.change_root_to_parent, opts = opts("Up") }, - -- MOD KEYS Ctrl+ - { keys = "", cmd = api.tree.change_root_to_node, opts = opts("CD") }, - { keys = "", cmd = api.node.open.replace_tree_buffer, opts = opts("Open: In Place") }, - { keys = "", cmd = api.node.show_info_popup, opts = opts("Info") }, - { keys = "", cmd = api.fs.rename_sub, opts = opts("Rename: Omit Filename") }, - { keys = "", cmd = api.node.open.tab, opts = opts("Open: New Tab") }, - { keys = "", cmd = api.node.open.vertical, opts = opts("Open: Vertical Split") }, - { keys = "", cmd = api.node.open.horizontal, opts = opts("Open: Horizontal Split") }, - { keys = "", cmd = ":b#", opts = opts("Focus to previous buffer") }, - -- Mouse 鼠标键 - { keys = "<2-LeftMouse>", cmd = api.node.open.edit, opts = opts("Open") }, - { keys = "<2-RightMouse>", cmd = api.tree.change_root_to_node, opts = opts("CD") }, - } -end - -return M diff --git a/home/dot_config/nvim/lua/keymaps/user-command.lua b/home/dot_config/nvim/lua/keymaps/user-command.lua index d32b9ed..09646d4 100644 --- a/home/dot_config/nvim/lua/keymaps/user-command.lua +++ b/home/dot_config/nvim/lua/keymaps/user-command.lua @@ -34,3 +34,27 @@ vim.api.nvim_create_user_command("Reload", function() end, { desc = "Reload Neovim configuration", }) + +local renameCurrentBuffer = function() + local old_name = vim.fn.expand("%:p") + local new_name = vim.fn.input("New name: ", vim.fn.expand("%:p:h") .. "/") + + if new_name == "" then + print("No new name provided") + return + elseif new_name == old_name then + return + end + + vim.cmd("write") + + local success, err = os.rename(old_name, new_name) + if not success then + print("Error renaming file: " .. err) + return + end + + vim.cmd("edit " .. new_name) + vim.cmd("bdelete " .. old_name) +end +vim.api.nvim_create_user_command("Rename", renameCurrentBuffer, {}) diff --git a/home/dot_config/nvim/lua/keymaps/visual-multi.lua b/home/dot_config/nvim/lua/keymaps/visual-multi.lua deleted file mode 100644 index e42386e..0000000 --- a/home/dot_config/nvim/lua/keymaps/visual-multi.lua +++ /dev/null @@ -1,9 +0,0 @@ --- Note that this plugin is a fork for colemak --- Use mouse to select multiple cursors -vim.g.VM_mouse_mappings = 1 --- Disable default mappings - -vim.g.VM_maps = { - ["Add Cursor Down"] = "", - ["Add Cursor Up"] = "", -} diff --git a/home/dot_config/nvim/lua/plugins/dap.lua b/home/dot_config/nvim/lua/plugins/dap.lua index 37c5cc7..1258bee 100644 --- a/home/dot_config/nvim/lua/plugins/dap.lua +++ b/home/dot_config/nvim/lua/plugins/dap.lua @@ -1,3 +1,4 @@ +-- TODO: -- Debugger setups return { { diff --git a/home/dot_config/nvim/lua/plugins/edit.lua b/home/dot_config/nvim/lua/plugins/edit.lua index a3b8fa0..65fe609 100644 --- a/home/dot_config/nvim/lua/plugins/edit.lua +++ b/home/dot_config/nvim/lua/plugins/edit.lua @@ -3,7 +3,7 @@ return { "folke/flash.nvim", event = "BufEnter", opts = {}, - -- stylua: ignore + -- stylua: ignore start keys = { { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, @@ -11,6 +11,7 @@ return { { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, }, + -- stylua: ignore end }, { import = "plugins.mod.img-clip" }, { import = "plugins.mod.mc" }, -- Multiple-cursors diff --git a/home/dot_config/nvim/lua/plugins/mod/alpha-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/alpha-nvim.lua deleted file mode 100644 index 4b04359..0000000 --- a/home/dot_config/nvim/lua/plugins/mod/alpha-nvim.lua +++ /dev/null @@ -1,55 +0,0 @@ --- alpha-nvim.lua -return { - { - "goolord/alpha-nvim", - dependencies = {}, - keys = { - { "ba", "Alpha", desc = "Toggle Alpha Dashboard" }, - }, - cmd = { - "Alpha", - }, - config = function() - local alpha = require("alpha") - local dashboard = require("alpha.themes.dashboard") - dashboard.section.header.val = { - " ", - "================= =============== =============== ======== ========", - "\\\\ . . . . . . .\\\\ //. . . . . . .\\\\ //. . . . . . .\\\\ \\\\. . .\\\\// . . //", - "||. . ._____. . .|| ||. . ._____. . .|| ||. . ._____. . .|| || . . .\\/ . . .||", - "|| . .|| ||. . || || . .|| ||. . || || . .|| ||. . || ||. . . . . . . ||", - "||. . || || . .|| ||. . || || . .|| ||. . || || . .|| || . | . . . . .||", - "|| . .|| ||. _-|| ||-_ .|| ||. . || || . .|| ||. _-|| ||-_.|\\ . . . . ||", - "||. . || ||-' || || `-|| || . .|| ||. . || ||-' || || `|\\_ . .|. .||", - "|| . _|| || || || || ||_ . || || . _|| || || || |\\ `-_/| . ||", - "||_-' || .|/ || || \\|. || `-_|| ||_-' || .|/ || || | \\ / |-_.||", - "|| ||_-' || || `-_|| || || ||_-' || || | \\ / | `||", - "|| `' || || `' || || `' || || | \\ / | ||", - "|| .===' `===. .==='.`===. .===' /==. | \\/ | ||", - "|| .==' \\_|-_ `===. .===' _|_ `===. .===' _-|/ `== \\/ | ||", - "|| .==' _-' `-_ `=' _-' `-_ `=' _-' `-_ /| \\/ | ||", - "|| .==' _-' `-__\\._-' `-_./__-' `' |. /| | ||", - "||.==' _-' `' | /==.||", - "==' _-' j s 0 n y N E O V I M \\/ `==", - "\\ _-' `-_ /", - " `'' ``' ", - } - dashboard.section.buttons.val.leader = "SPC" - dashboard.section.buttons.val = { - -- leader = "SPC", - dashboard.button("p", "󰈞 查找项目", "Telescope projects"), - dashboard.button("h", " 历史文件", "Telescope oldfiles"), - dashboard.button("l", " 加载会话", "SessionSearch"), - dashboard.button("c", " 转到设置", "Telescope find_files cwd=~/.config/nvim"), - dashboard.button("SPC q", "󱊷 退出", "qa"), - } - dashboard.section.footer.val = "今日 " .. os.date("%Y-%m-%d %A") .. " " - - dashboard.config.opts.noautocmd = true - - -- vim.cmd[[autocmd User AlphaReady echo 'Alpha ready!']] - - alpha.setup(dashboard.config) - end, - }, -} diff --git a/home/dot_config/nvim/lua/plugins/mod/hover-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/hover-nvim.lua deleted file mode 100644 index cb52557..0000000 --- a/home/dot_config/nvim/lua/plugins/mod/hover-nvim.lua +++ /dev/null @@ -1,58 +0,0 @@ -return { - "lewis6991/hover.nvim", - opts = { - init = function() - -- Require providers - require("hover.providers.lsp") - -- require('hover.providers.gh') - -- require('hover.providers.gh_user') - -- require('hover.providers.jira') - -- require('hover.providers.dap') - -- require('hover.providers.fold_preview') - require("hover.providers.diagnostic") - -- require('hover.providers.man') - -- require('hover.providers.dictionary') - end, - preview_opts = { - border = "single", - }, - -- Whether the contents of a currently open hover window should be moved - -- to a :h preview-window when pressing the hover keymap. - preview_window = false, - title = true, - mouse_providers = { - "LSP", - }, - mouse_delay = 1000, - }, - keys = { - { - "gE", - function() - require("hover").hover_select() - end, - desc = "hover.nvim (select)", - }, - { - "", - function() - require("hover").hover_switch("previous") - end, - desc = "hover.nvim (previous source)", - }, - { - "", - function() - require("hover").hover_switch("next") - end, - desc = "hover.nvim (next source)", - }, - { - "", - function() - require("hover").hover_mouse() - end, - desc = "hover.nvim (mouse)", - }, - }, -} diff --git a/home/dot_config/nvim/lua/plugins/mod/image-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/image-nvim.lua deleted file mode 100644 index ac0fb6d..0000000 --- a/home/dot_config/nvim/lua/plugins/mod/image-nvim.lua +++ /dev/null @@ -1,22 +0,0 @@ --- I forgot why I keep this plugin, I use snacks.nvim currently - -return {} - --- 2025-03-03 --- If current session is not spawn by neovide, do not load image.nvim --- neovide did not support image viewer yet --- https://github.com/neovide/neovide/issues/2088 --- Disable on: Neovide, alacritty and windows --- if vim.g.neovide then --- return {} --- elseif vim.env.TERM_PROGRAM == "alacritty" then --- return {} --- elseif vim.loop.os_uname().sysname:lower() == "windows_nt" then --- return {} --- else --- return { --- "3rd/image.nvim", --- opts = {}, --- event = "BufReadPre", --- } --- end diff --git a/home/dot_config/nvim/lua/plugins/mod/nvim-cmp.lua b/home/dot_config/nvim/lua/plugins/mod/nvim-cmp.lua deleted file mode 100644 index 4e92412..0000000 --- a/home/dot_config/nvim/lua/plugins/mod/nvim-cmp.lua +++ /dev/null @@ -1,111 +0,0 @@ -return { - "hrsh7th/nvim-cmp", - -- lazy = false, - event = "InsertEnter", - dependencies = { - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "hrsh7th/cmp-cmdline", - "L3MON4D3/LuaSnip", - "saadparwaiz1/cmp_luasnip", - }, - config = function() - local cmp = require("cmp") - local capabilities = require("cmp_nvim_lsp").default_capabilities() - local servers_module = require("config.servers") - local luasnip = require("luasnip") - local servers = servers_module.servers - local servers_config = servers_module.server_config - -- 默认 LSP 配置 - local default_server_config = { - capabilities = capabilities, - } - - -- local raw_keymaps = require("keymaps.cmp_map")(cmp.mapping) -- require("keymaps").cmp_nvim_keymaps(cmp.mapping) - -- local mapped = set_keymaps(raw_keymaps) - local kind_icons = require("config.icons").lsp_kind - -- 配置 nvim-cmp - cmp.setup({ - formatting = { - format = function(entry, vim_item) - vim_item.kind = string.format("%s %s", kind_icons[vim_item.kind] or "", vim_item.kind) - return vim_item - end, - }, - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, - mapping = { - -- cmp.mapping.preset.insert(mapped), - [""] = cmp.mapping.select_next_item(), - [""] = cmp.mapping.select_prev_item(), - [""] = cmp.mapping.confirm({ select = true }), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - if luasnip.expandable() then - luasnip.expand() - else - cmp.confirm({ - select = true, - }) - end - else - fallback() - end - end), - - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.confirm({ select = true }) - elseif luasnip.locally_jumpable(1) then - luasnip.jump(1) - else - fallback() - end - end, { "i", "s" }), - - [""] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { "i", "s" }), - }, -- cmp.mapping.preset.insert(mapped), - sources = cmp.config.sources({ - { name = "copilot", priority = 10 }, - { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "lazydev", group_index = 0 }, - }, { - { name = "buffer" }, - { name = "path" }, - }), - }) - - cmp.setup.cmdline({ "/", "?" }, { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = "buffer" }, - }, - }) - - cmp.setup.cmdline(":", { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = "path" }, - }, { - { name = "cmdline" }, - }), - matching = { disallow_symbol_nonprefix_matching = false }, - }) - - end, -} diff --git a/home/dot_config/nvim/lua/plugins/mod/nvim-lspconfig.lua b/home/dot_config/nvim/lua/plugins/mod/nvim-lspconfig.lua deleted file mode 100644 index fa931e5..0000000 --- a/home/dot_config/nvim/lua/plugins/mod/nvim-lspconfig.lua +++ /dev/null @@ -1,40 +0,0 @@ -return { - "neovim/nvim-lspconfig", - dependencies = { "saghen/blink.cmp" }, - event = { - "BufReadPost", - "BufWritePost", - "BufNewFile", - }, - - -- example using `opts` for defining servers - opts = { - servers = { - lua_ls = {}, - bashls = {}, - clangd = {}, - eslint = {}, -- JavaScript - gopls = {}, -- Go - jsonls = {}, -- JSON - markdown_oxide = {}, -- Markdown - omnisharp = {}, -- C# & F# - powershell_es = {}, -- PowerShell - pyright = {}, -- Python - taplo = {}, -- TOML - rust_analyzer = {}, -- Rust - ts_ls = {}, -- TypeScript - vimls = {}, -- vimscript - yamlls = {}, -- YAML - beancount = {}, -- Beancount - }, - }, - config = function(_, opts) - local lspconfig = require("lspconfig") - for server, config in pairs(opts.servers) do - -- passing config.capabilities to blink.cmp merges with the capabilities in your - -- `opts[server].capabilities, if you've defined it - config.capabilities = require("blink.cmp").get_lsp_capabilities(config.capabilities) - lspconfig[server].setup(config) - end - end, -} diff --git a/home/dot_config/nvim/lua/plugins/mod/nvim-tree.lua b/home/dot_config/nvim/lua/plugins/mod/nvim-tree.lua deleted file mode 100644 index 7820a47..0000000 --- a/home/dot_config/nvim/lua/plugins/mod/nvim-tree.lua +++ /dev/null @@ -1,53 +0,0 @@ -local function my_on_attach(bufnr) - -- local keymaps = require("config.keymaps") - local api = require("nvim-tree.api") - local default_mode = { "n" } - local keymaps = require("keymaps") - - local function opts(desc) - return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true } - end - - local function set_keymaps(maps) - for _, map in ipairs(maps) do - local mode = map.mode or default_mode - vim.keymap.set(mode, map.keys, map.cmd, map.opts) - end - end - - local raw_keymaps = require("keymaps.nvim-tree").plugin(api, opts) - set_keymaps(raw_keymaps) -end - -return { - "nvim-tree/nvim-tree.lua", - version = "*", - lazy = false, - keys = { - { "ft", "NvimTreeToggle", desc = "Toggle File Explorer" }, - }, - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - opts = { - on_attach = my_on_attach, - sync_root_with_cwd = true, - respect_buf_cwd = true, - disable_netrw = true, - renderer = { - icons = { - glyphs = { - git = { -- https://github.com/nvim-neo-tree/neo-tree.nvim/blob/main/doc/neo-tree.txt#L1077C1-L1077C29 - unmerged = "", - renamed = "➜", - deleted = "", - untracked = "", - ignored = "", - unstaged = "󰄱", - staged = "", - }, - }, - }, - }, - }, -} diff --git a/home/dot_config/nvim/lua/plugins/mod/telescope.lua b/home/dot_config/nvim/lua/plugins/mod/telescope.lua deleted file mode 100644 index 6a5d4ca..0000000 --- a/home/dot_config/nvim/lua/plugins/mod/telescope.lua +++ /dev/null @@ -1,52 +0,0 @@ -return { - "nvim-telescope/telescope.nvim", - cmd = "Telescope", - opts = { - defaults = { - prompt_prefix = require("config.icons").telescope, - selection_caret = " ", - entry_prefix = " ", - layout_config = { -- https://github.com/NvChad/NvChad/blob/v2.5/lua/nvchad/configs/telescope.lua - horizontal = { - prompt_position = "top", - preview_width = 0.55, - }, - width = 0.87, - height = 0.80, - }, - mappings = { - n = { - ["n"] = "move_selection_next", - ["e"] = "move_selection_previous", - ["w"] = "preview_scrolling_up", - ["r"] = "preview_scrolling_down", - ["a"] = "preview_scrolling_left", - ["s"] = "preview_scrolling_right", - ["q"] = require("telescope.actions").close, - }, - }, - }, - }, - dependencies = { "nvim-lua/plenary.nvim" }, - keys = { - { "", "Telescope find_files", desc = "Find Files" }, - { "fc", "Telescope find_files cwd=~/.config/nvim", desc = "Edit configs" }, - { "/", "Telescope live_grep", desc = "Grep Files" }, - { ";", "Telescope", desc = "Show Telescope Commands" }, - { "ui", "FzfLua colorscheme", desc = "Change colorscheme" }, - { "pp", "Telescope projects", desc = "List all Projects" }, - { "pg", "Telescope projects", desc = "List all Git Projects" }, - { "ps", "Telescope session-lens", desc = "List all sessions" }, - { "gs", "Telescope git_status", desc = "Git Status" }, - { "gt", "Telescope git_branches", desc = "Git Branches" }, - { "gc", "Telescope git_commits", desc = "Show commits" }, - { "fb", "Telescope buffers", desc = "List Buffers" }, - { "ff", "Telescope fd", desc = "Find Files" }, - { "fh", "Telescope oldfiles", desc = "Recent Files" }, - { "ce", "Telescope diagnostics", desc = "Navigate errors/warnings" }, - { "cs", "Telescope treesitter", desc = "Search symbols" }, - { "cS", "Telescope grep_string", desc = "Search current symbol" }, - { "bB", "Telescope buffers", desc = "List Buffers" }, - { "fl", "Telescope filetypes", desc = "Set Filetype/Lang to ..." }, - }, -}