更新配置

README.md

@@ -14,10 +14,13 @@ git clone ssh://git@git.zeekling.cn:222/linux/nvim-config.git ~/.config/nvim
 |---- |---- |----|
 | \<space>bp |  跳转到上一个buffer | Buffer |
 | \<space>bp |  跳转到下一个buffer | Buffer |
-| \<space>ds | 在左边显示目录数 | Dir |
+| \<space>dt | 在左边显示或者关闭目录数 | Dir |
-| \<space>dc | 关闭左边的目录树 | Dir |
+| \<space>mkp | 预览Markdown | Markdown |
-| \<space>mks | 预览Markdown | Markdown |
+| \<space>ff | 格式化代码 | Format |
-| \<space>mkc | 关闭预览Markdown | Markdown |
+| \<space>fsf | 在当前目录下面查找文件。支持模糊匹配 | Search |
+| \<space>fsg | 在当前目录下的文件查找字符串 | S earch |
+| \<space>fsb | 在打开的buffer中查找字符串 | Search |
+| \<space>ls | 显示Lazy概览页面 | Lazy |
 
 ## 帮助
 

lua/basic.lua

@@ -2,5 +2,8 @@ vim.g.mapleader = " "
 vim.o.background = "light"
 
 vim.cmd("set ignorecase")
-
+vim.cmd("set tabstop=4")
-
+vim.cmd("set cursorline")
+vim.cmd("set softtabstop=4")
+vim.cmd("set shiftwidth=4")
+vim.cmd("set shiftround")

lua/plugins/auto-complete.lua

@@ -7,6 +7,8 @@ return {
 			"hrsh7th/cmp-nvim-lsp",
 			"L3MON4D3/LuaSnip",
 			"saadparwaiz1/cmp_luasnip",
+			"neovim/nvim-lspconfig",
+			"hrsh7th/cmp-cmdline"
 		},
 		config = function()
 			local cmp = require("cmp")
@@ -33,9 +35,6 @@ return {
 			})
 		end,
 	},
-	{
-		"neovim/nvim-lspconfig",
-	},
 	{
 		"nvim-treesitter/nvim-treesitter",
 		config = function()
@@ -60,6 +59,9 @@ return {
 					"vim",
 					"xml",
 					"tcl",
+					"yaml",
+					"ini",
+					"comment",
 				},
 			})
 		end,

lua/plugins/help.lua

@@ -17,18 +17,21 @@ return {
 					},
 					d = {
 						name = "dirTree",
-						s = { "<cmd>NvimTreeToggle<cr>", "show dir tree on left" },
+						t = { "<cmd>NvimTreeToggle<cr>", "show or hidden dir tree on left" },
-						c = { "<cmd>NvimTreeClose<cr>", "hidden dir tree on left" },
 					},
 					f = {
-						name = "Search,Format",
+						name = "Search,Format Code",
 						s = {
 							name = "Search",
-							f = { "<cmd>Telescope find_files<cr>", "Search file by name" },
+							f = { "<cmd>Telescope find_files<cr>", "Search files" },
-							g = { "<cmd>Telescope live_grep<cr>", "Grep in files" },
+							g = { "<cmd>Telescope live_grep<cr>", "Find string in files" },
-							b = { "<cmd>Telescope buffers<cr>", "Grep in buffer" },
+							b = { "<cmd>Telescope buffers<cr>", "Find string in buffer" },
 						},
-						f = { "<cmd>Format<cr>", "Code Format" },
+						f = { "<cmd>Format<cr>", "Format Code" },
+					},
+					g = {
+						name = "Git",
+						b = {"<cmd>Gitsigns blame<cr>", "git blame"}
 					},
 					l = {
 						name = "Lazy",
@@ -40,8 +43,7 @@ return {
 						name = "Markdown",
 						k = {
 							name = "Markdown",
-							s = { "<cmd>MarkdownPreview<cr>", "MarkdownPreview" },
+							p = { "<cmd>MarkdownPreview<cr>", "MarkdownPreview" },
-							c = { "<cmd>MarkdownPreviewStop<cr>", "MarkdownPreviewStop" },
 						},
 					},
 					s = {
@@ -61,8 +63,8 @@ return {
 							m = { "<cmd>JavaTestRunCurrentMethod<cr>", "Run current Method" },
 							v = { "<cmd>JavaTestViewLastReport<cr>", "View Last Report" },
 						},
-						m = {"<cmd>JavaRunnerRunMain<cr>", "Run main Method"},
+						m = { "<cmd>JavaRunnerRunMain<cr>", "Run main Method" },
-						p = {"<cmd>JavaProfile<cr>", "Run Java Profile"},
+						p = { "<cmd>JavaProfile<cr>", "Run Java Profile" },
 					},
 					v = {
 						name = "version",

lua/plugins/plugin-base.lua

@@ -117,7 +117,9 @@ return {
 	{
 		"nvim-lualine/lualine.nvim",
 		config = function()
-			require("lualine").setup()
+			require("lualine").setup({
+				theme = "vscode",
+			})
 		end,
 	},
 	{
@@ -138,7 +140,7 @@ return {
 		tag = "v3.*",
 		config = function()
 			vim.g.termguicolors = true
-			require("bufferline").setup()
+			require("bufferline").setup({})
 		end,
 	},
 	{

lua/plugins/plugin-git.lua

@@ -2,4 +2,13 @@ return {
 	{
 		"tpope/vim-fugitive",
 	},
+	{
+		"lewis6991/gitsigns.nvim",
+		config = function()
+			require("gitsigns").setup({})
+		end,
+	},
+	{
+		"sindrets/diffview.nvim",
+	},
 }

lua/plugins/themes.lua

@@ -1,12 +1,12 @@
 return {
-	{
-		"projekt0n/github-nvim-theme",
-	},
 	{
 		"Mofiqul/vscode.nvim",
-		lazy = false,
 		config = function()
-			require("vscode").setup({})
+			require("vscode").setup({
+				disable_nvimtree_bg = true,
+				italic_comments = true,
+				underline_links = true,
+			})
 			vim.cmd("colorscheme vscode")
 		end,
 	},