From a32a68a24b58aae536ac6d0f1e3369c4aa4b733c Mon Sep 17 00:00:00 2001 From: dichgrem Date: Tue, 21 Oct 2025 10:59:44 +0800 Subject: [PATCH] chore:add_diffview --- home/nvim/lua/config/keymaps.lua | 12 ++++++------ home/nvim/lua/plugins/colorscheme.lua | 28 +++++++++++++-------------- home/nvim/lua/plugins/dashboard.lua | 16 +++++++-------- home/nvim/lua/plugins/diffview.lua | 8 ++++++++ 4 files changed, 36 insertions(+), 28 deletions(-) create mode 100644 home/nvim/lua/plugins/diffview.lua diff --git a/home/nvim/lua/config/keymaps.lua b/home/nvim/lua/config/keymaps.lua index aa48b03..70f0791 100644 --- a/home/nvim/lua/config/keymaps.lua +++ b/home/nvim/lua/config/keymaps.lua @@ -13,11 +13,11 @@ map("n", "", "bprevious", { desc = "Previous buffer (like VSCo vim.keymap.set("n", "", "BufferLinePickClose", { desc = "Close buffer (BufferLine)" }) vim.keymap.set("n", "", function() - if vim.bo.buftype == "terminal" then - vim.cmd("vsplit | terminal") - else - vim.cmd("botright split | terminal") - end + if vim.bo.buftype == "terminal" then + vim.cmd("vsplit | terminal") + else + vim.cmd("botright split | terminal") + end end, { desc = "Split terminal" }) -- 在终端模式下的快捷键 @@ -27,5 +27,5 @@ vim.keymap.set("t", "", "k", { desc = "Go to upper window" vim.keymap.set("t", "", "l", { desc = "Go to right window" }) vim.keymap.set("n", "xo", function() - vim.fn.jobstart({ "xdg-open", vim.fn.expand("%:p") }, { detach = true }) + vim.fn.jobstart({ "xdg-open", vim.fn.expand("%:p") }, { detach = true }) end, { desc = "使用系统默认应用程序打开当前文件" }) diff --git a/home/nvim/lua/plugins/colorscheme.lua b/home/nvim/lua/plugins/colorscheme.lua index 5fa6dfb..9c69b37 100644 --- a/home/nvim/lua/plugins/colorscheme.lua +++ b/home/nvim/lua/plugins/colorscheme.lua @@ -1,16 +1,16 @@ return { - { - "folke/tokyonight.nvim", - lazy = false, - priority = 1000, - opts = { - style = "storm", - }, - config = function(_, opts) - require("tokyonight").setup(opts) - vim.defer_fn(function() - vim.cmd([[colorscheme tokyonight]]) - end, 0) - end, - }, + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + opts = { + style = "storm", + }, + config = function(_, opts) + require("tokyonight").setup(opts) + vim.defer_fn(function() + vim.cmd([[colorscheme tokyonight]]) + end, 0) + end, + }, } diff --git a/home/nvim/lua/plugins/dashboard.lua b/home/nvim/lua/plugins/dashboard.lua index 02a47d1..6764304 100644 --- a/home/nvim/lua/plugins/dashboard.lua +++ b/home/nvim/lua/plugins/dashboard.lua @@ -1,10 +1,10 @@ -- ~/.config/nvim/lua/plugins/dashboard.lua return { - "folke/snacks.nvim", - opts = { - dashboard = { - preset = { - header = [[ + "folke/snacks.nvim", + opts = { + dashboard = { + preset = { + header = [[ ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ @@ -12,7 +12,7 @@ return { ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ]], - }, - }, - }, + }, + }, + }, } diff --git a/home/nvim/lua/plugins/diffview.lua b/home/nvim/lua/plugins/diffview.lua new file mode 100644 index 0000000..f260d29 --- /dev/null +++ b/home/nvim/lua/plugins/diffview.lua @@ -0,0 +1,8 @@ +return { + "sindrets/diffview.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewFileHistory" }, + config = function() + require("diffview").setup() + end, +}