增加leader + h 返回桌面

README.md

@@ -1 +1 @@
-sdfot:qa
+

coc-settings.json

@@ -1,5 +1,69 @@
 {
-  "prettier.singleQuote": true,
-  "prettier.trailingComma": "all",
-  "prettier.bracketSpacing": false
+    "hover.floatConfig": { "border": true, "rounded": true, "focusable": true },
+    "suggest.floatConfig": { "border": true, "rounded": true },
+    "diagnostic.floatConfig": { "border": true, "rounded": true },
+    "signature.floatConfig": { "border": true, "rounded": true },
+    "list.autoPreview": true,
+    "outline.autoPreview": true,
+    "git.floatConfig": { "border": true, "rounded": true },
+    "notification.disabledProgressSources": ["*"],
+    "diagnostic.signOffset": 1,
+    "diagnostic.errorSign": "┃",
+    "diagnostic.warningSign": "┃",
+    "diagnostic.infoSign": "┃",
+    "diagnostic.hintSign": "┃",
+    "inlayHint.enable": false,
+    "list.alignColumns": true,
+    "list.floatPreview": true,
+    "snippets.userSnippetsDirectory": "~/.config/nvim/snippets",
+    "snippets.ultisnips.directories": ["~/.config/nvim/snippets/ultisnips"],
+    "snippets.extends.javascript": ["typescript"],
+    "tabnine.priority": 80,
+    "pairs.enableCharacters": ["(", "[", "{", "'", "\"", "`"],
+    "pairs.enableBackspace": true,
+    "translator.engines": ["youdao", "google"],
+    "tsserver.trace.server": "messages",
+    "tsserver.enableJavascript": true,
+    "tsserver.enable": false,
+    "volar.takeOverMode.enabled": true,
+    "volar.autoCreateQuotes": true,
+    "pyright.inlayHints.enable": false,
+    "git.addedSign.hlGroup": "GitGutterAdd",
+    "git.changedSign.hlGroup": "GitGutterChange",
+    "git.removedSign.hlGroup": "GitGutterDelete",
+    "git.topRemovedSign.hlGroup": "GitGutterDelete",
+    "git.changeRemovedSign.hlGroup": "GitGutterDelete",
+    "git.changedSign.text": "┃",
+    "git.addedSign.text": "┃",
+    "git.removedSign.text": "▁",
+    "git.topRemovedSign.text": "▔",
+    "git.changeRemovedSign.text": "≃",
+    "git.branchCharacter": "",
+    "git.showCommitInFloating": true,
+    "git.addGBlameToVirtualText": false,
+    "git.addGBlameToBufferVar": true,
+    "git.splitWindowCommand": "below 10sp",
+    "java.clean.workspace": true,
+    "java.configuration.runtimes": [
+        {
+            "name": "JavaSE-14",
+            "path": "/opt/jdk-14.0.2",
+            "default": true
+        }
+    ],
+    "clangd.path": "~/.config/coc/extensions/coc-clangd-data/install/15.0.6/clangd_15.0.6/bin/clangd",
+    "prettier": {
+        "tabWidth": 4,
+        "printWidth": 160,
+        "singleQuote": true,
+        "disableSuccessMessage": true,
+        "formatterPriority": 999
+    },
+    "go.goplsOptions": {
+        "completeUnimported": true,
+        "staticcheck": true
+    },
+    "git.enableGutters": true,
+    "Lua.telemetry.enable": true,
+    "@nomicfoundation/coc-solidity.telemetry": true
 }

init.lua

@@ -17,6 +17,4 @@ require("plugin-config.nvim-treesitter")
 require("plugin-config.prettier")
 require("plugin-config.null-ls")
 -- 内置LSP (新增)
-require("lsp.setup")
-require("lsp.cmp")
-
+require("lsp.config.coc")

lua/basic.lua

@@ -14,10 +14,10 @@ vim.wo.signcolumn = "yes"
 -- 右侧参考线，超过表示代码太长，换行
 --  vim.wo.colorcolumn = "180"
 -- 缩进2 个空格等于一个tab
-vim.o.tabstop = 2
-vim.bo.tabstop = 2
-vim.o.softtabstop = 2
-vim.o.shiftround = 2
+vim.o.tabstop = 4
+vim.bo.tabstop = 4
+vim.o.softtabstop = 4
+vim.o.shiftround = 4
 --  时移长scsc
 vim.o.shiftwidth = 2
 vim.bo.shiftwidth = 2

lua/keybindings.lua

@@ -29,6 +29,8 @@ map("n", "<A-Right>", "<C-w>l", opt)
 map("n", "<A-Down>", "<C-w>j", opt)
 map("n", "<A-Up>", "<C-w>k", opt)
 map("n", "<A-Left>", "<C-w>h", opt)
+-- 返回dashboard 主页
+map("n", "<leader>h", ":Dashboard<CR>", opt)
 -- terminal 相关
 map("n", "<leader>t", ":FloatermToggle<CR>", opt)
 -- 代码缩进
@@ -70,36 +72,36 @@ local pluginKeys = {}
 map("n", "<leader>e", ":NvimTreeToggle<CR>", opt)
 -- 列表快捷键
 pluginKeys.nvimTreeList = { -- 打开文件或文件夹
-{
-    key = {"o", "<2-LeftMouse>"},
-    action = "edit"
-}, {
+    {
+        key = { "o", "<2-LeftMouse>" },
+        action = "edit"
+    }, {
     key = "<CR>",
     action = "system_open"
 }, -- v分屏打开文件
-{
-    key = "v",
-    action = "vsplit"
-}, -- h分屏打开文件
-{
-    key = "h",
-    action = "split"
-}, -- Ignore (node_modules)
-{
-    key = "i",
-    action = "toggle_ignored"
-}, -- Hide (dotfiles)
-{
-    key = ".",
-    action = "toggle_dotfiles"
-}, {
+    {
+        key = "v",
+        action = "vsplit"
+    }, -- h分屏打开文件
+    {
+        key = "h",
+        action = "split"
+    }, -- Ignore (node_modules)
+    {
+        key = "i",
+        action = "toggle_ignored"
+    }, -- Hide (dotfiles)
+    {
+        key = ".",
+        action = "toggle_dotfiles"
+    }, {
     key = "R",
     action = "refresh"
 }, -- 文件操作
-{
-    key = "a",
-    action = "create"
-}, {
+    {
+        key = "a",
+        action = "create"
+    }, {
     key = "d",
     action = "remove"
 }, {
@@ -130,14 +132,14 @@ pluginKeys.nvimTreeList = { -- 打开文件或文件夹
     key = "n",
     action = "tabnew"
 }, -- 进入下一级
-{
-    key = {"]"},
-    action = "cd"
-}, -- 进入上一级
-{
-    key = {"["},
-    action = "dir_up"
-}}
+    {
+        key = { "]" },
+        action = "cd"
+    }, -- 进入上一级
+    {
+        key = { "[" },
+        action = "dir_up"
+    } }
 
 -- lsp 快捷键
 pluginKeys.lspList = function(bufnr)
@@ -172,7 +174,7 @@ end
 pluginKeys.cmp = function(cmp)
     return {
         -- 出现补全
-        ["<A-.>"] = cmp.mapping(cmp.mapping.complete(), {"i", "c"}),
+        ["<A-.>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
         -- 取消
         ["<A-,>"] = cmp.mapping({
             i = cmp.mapping.abort(),
@@ -188,8 +190,8 @@ pluginKeys.cmp = function(cmp)
             behavior = cmp.ConfirmBehavior.Replace
         }),
         -- 如果窗口内容太多，可以滚动
-        ["<C-u>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), {"i", "c"}),
-        ["<C-d>"] = cmp.mapping(cmp.mapping.scroll_docs(4), {"i", "c"}),
+        ["<C-u>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }),
+        ["<C-d>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }),
     }
 end
 

lua/lsp/config/coc.lua

@@ -1 +1,51 @@
-print('e')
+local keyset = vim.keymap.set
+
+
+
+-- Autocomplete
+function _G.check_back_space()
+    local col = vim.fn.col('.') - 1
+    return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil
+end
+
+-- Use Tab for trigger completion with characters ahead and navigate
+-- NOTE: There's always a completion item selected by default, you may want to enable
+-- no select by setting `"suggest.noselect": true` in your configuration file
+-- NOTE: Use command ':verbose imap <tab>' to make sure Tab is not mapped by
+-- other plugins before putting this into your config
+local opts = { silent = true, noremap = true, expr = true, replace_keycodes = false }
+
+--  keyset("i", "<TAB>", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "<TAB>" : coc#refresh()', opts)
+keyset("i", "<S-TAB>", [[coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"]], opts)
+
+-- Make <CR> to accept selected completion item or notify coc.nvim to format
+-- <C-g>u breaks current undo, please make your own choice
+keyset("i", "<TAB>", [[coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"]], opts)
+
+-- Use <c-j> to trigger snippets
+keyset("i", "<c-j>", "<Plug>(coc-snippets-expand-jump)")
+-- Use <c-space> to trigger completion
+keyset("i", "<c-space>", "coc#refresh()", {silent = true, expr = true})
+
+-- Use `[g` and `]g` to navigate diagnostics
+-- Use `:CocDiagnostics` to get all diagnostics of current buffer in location list
+keyset("n", "[g", "<Plug>(coc-diagnostic-prev)", {silent = true})
+keyset("n", "]g", "<Plug>(coc-diagnostic-next)", {silent = true})
+
+-- GoTo code navigation
+keyset("n", "gd", "<Plug>(coc-definition)", {silent = true})
+keyset("n", "gy", "<Plug>(coc-type-definition)", {silent = true})
+keyset("n", "gi", "<Plug>(coc-implementation)", {silent = true})
+keyset("n", "gr", "<Plug>(coc-references)", {silent = true})
+
+function _G.show_docs()
+    local cw = vim.fn.expand('<cword>')
+    if vim.fn.index({'vim', 'help'}, vim.bo.filetype) >= 0 then
+        vim.api.nvim_command('h ' .. cw)
+    elseif vim.api.nvim_eval('coc#rpc#ready()') then
+        vim.fn.CocActionAsync('doHover')
+    else
+        vim.api.nvim_command('!' .. vim.o.keywordprg .. ' ' .. cw)
+    end
+end
+keyset("n", "K", '<CMD>lua _G.show_docs()<CR>', {silent = true})

lua/lsp/config/lua.lua

@@ -3,6 +3,7 @@ local runtime_path = vim.split(package.path, ";")
 table.insert(runtime_path, "lua/?.lua")
 table.insert(runtime_path, "lua/?/init.lua")
 
+
 return {
     on_setup = function(server)
         server.setup({
@@ -40,4 +41,4 @@ return {
             end,
         })
     end,
-}
+}

lua/lsp/setup.lua

@@ -1,29 +1,20 @@
+local lsp = require('lsp-zero').preset({})
 
-local status, mason_lspconfig = pcall(require, "mason-lspconfig")
-if not status then
-    vim.notify("not found mason lspconfig")
-    return
-end
+lsp.on_attach(function(client, bufnr)
+    lsp.default_keymaps({ buffer = bufnr })
+end)
 
-local lsp_status, lspconfig = pcall(require, "lspconfig")
-if not lsp_status then
-    vim.notify("not found lspconfig")
-    return
-end
-
--- 自动安装 指定的 lsp server
-mason_lspconfig.setup({
-    ensure_installed = { "lua_ls" },
+lsp.ensure_installed({
+    -- Replace these with whatever servers you want to install
+    'tsserver',
+    'eslint',
+    'rust_analyzer',
+    'cssls',
+    'cssmodules_ls',
+    'eslint',
+    'html',
+    'jsonls',
+    'volar'
 })
--- 加载对应的 lsp 的配置
-mason_lspconfig.setup_handlers({
-    function(server_name)
-        -- lspconfig[server_name].setup()
-    end,
-    ["lua_ls"] = function()
-        require("lsp.config.lua").on_setup(lspconfig["lua_ls"])
-    end
-});
 
--- mason not suooport lsp
--- use lspconfig
+lsp.setup()

lua/plugin-config/dashboard.lua

@@ -25,26 +25,22 @@ db.setup({
             key = 'f',
             keymap = 'SPC f',
             key_hl = 'Number',
-            action = ''
         }, {
             icon = ' ',
             desc = 'Find Word',
             key = 'k',
             keymap = 'SPC k',
-            action = 'lua print(3)'
         }, {
             icon = ' ',
             desc = 'Project',
             key = 'p',
             keymap = 'SPC p',
-            action = 'lua print(4)'
         }, {
             icon = '󰚰 ',
             desc = 'Plugins Update',
             key = 'u',
             name = "DsStore",
             keymap = 'SPC u',
-            action = 'lua print(4)'
         }},
         footer = db.custom_footer -- your footer
     }

lua/plugin-config/project.lua

@@ -18,3 +18,4 @@ if not status then
     return
 end
 pcall(telescope.load_extension, "projects")
+

lua/plugins.lua

@@ -6,9 +6,9 @@ local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
 local paccker_bootstrap
 if fn.empty(fn.glob(install_path)) > 0 then
     vim.notify("正在安装Pakcer.nvim，请稍后...")
-    paccker_bootstrap = fn.system({"git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim",
-    -- "https://gitcode.net/mirrors/wbthomason/packer.nvim",
-                                   install_path})
+    paccker_bootstrap = fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim",
+        -- "https://gitcode.net/mirrors/wbthomason/packer.nvim",
+        install_path })
 
     -- https://github.com/wbthomason/packer.nvim/issues/750
     local rtp_addition = vim.fn.stdpath("data") .. "/site/pack/*/start/*"
@@ -48,12 +48,12 @@ packer.startup({
         -- 文件搜索
         use {
             'nvim-telescope/telescope.nvim',
-            requires = {"nvim-lua/plenary.nvim"}
+            requires = { "nvim-lua/plenary.nvim" }
         }
         -- dashboard-nvim  vim 主页
         use {
             'glepnir/dashboard-nvim',
-            requires = {'nvim-tree/nvim-web-devicons'}
+            requires = { 'nvim-tree/nvim-web-devicons' }
         }
         use 'voldikss/vim-floaterm'
         -- project
@@ -65,20 +65,19 @@ packer.startup({
         }
         --------------------- LSP --------------------
         use {
-          'neoclide/coc.nvim',
-          branch = 'release'
+            'neoclide/coc.nvim',
+            branch = 'release'
         }
         -- Lspconfig
-        use({"neovim/nvim-lspconfig"})
-         use("hrsh7th/nvim-cmp")
+        use({ "neovim/nvim-lspconfig" })
+        --use("hrsh7th/nvim-cmp")
         -- snippet 引擎
-        use("hrsh7th/vim-vsnip")
         -- 补全源
-        use("hrsh7th/cmp-vsnip")
-        use("hrsh7th/cmp-nvim-lsp") -- { name = nvim_lsp }
-        use("hrsh7th/cmp-buffer") -- { name = 'buffer' },
-        use("hrsh7th/cmp-path") -- { name = 'path' }
-        use("hrsh7th/cmp-cmdline") -- { name = 'cmdline' }
+        --use("hrsh7th/cmp-vsnip")
+        --use("hrsh7th/cmp-nvim-lsp") -- { name = nvim_lsp }
+        --use("hrsh7th/cmp-buffer")   -- { name = 'buffer' },
+        --use("hrsh7th/cmp-path")     -- { name = 'path' }
+        --use("hrsh7th/cmp-cmdline")  -- { name = 'cmdline' }
 
         -- 常见编程语言代码段
         use("rafamadriz/friendly-snippets")
@@ -92,24 +91,12 @@ packer.startup({
         -- 代码格式化
         use('jose-elias-alvarez/null-ls.nvim')
         use('MunifTanjim/prettier.nvim')
-       -- 快捷键提示
-        -- use('folke/whick-key.nvim')
-        -- Lua
-          -- refer to the configuration section below
-        -- 补全引擎
-        -- use("hrsh7th/nvim-cmp")
-        -- snippet 引擎
-        -- use("hrsh7th/vim-vsnip")
-        -- 补全源
-        -- use("hrsh7th/cmp-vsnip")
-        -- use("hrsh7th/cmp-nvim-lsp") -- { name = nvim_lsp }
-        -- use("hrsh7th/cmp-buffer") -- { name = 'buffer' },
-        -- use("hrsh7th/cmp-path") -- { name = 'path' }
-        -- use("hrsh7th/cmp-cmdline") -- { name = 'cmdline' }
-
-        -- 常见编程语言代码段
-        -- use("rafamadriz/friendly-snippets")
-
+        use {
+           'numToStr/Comment.nvim',
+           config = function()
+           require('Comment').setup()
+          end
+        }
     end,
     config = {
         -- 并发数限制

plugin/packer_compiled.lua

@@ -74,59 +74,119 @@ end
 time([[try_loadstring definition]], false)
 time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
+  LuaSnip = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/LuaSnip",
+    url = "https://github.com/L3MON4D3/LuaSnip"
+  },
+  ["cmp-nvim-lsp"] = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    url = "https://github.com/hrsh7th/cmp-nvim-lsp"
+  },
   ["dashboard-nvim"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/dashboard-nvim",
-    url = "https://gitcode.net/mirrors/glepnir/dashboard-nvim"
+    url = "https://github.com/glepnir/dashboard-nvim"
+  },
+  ["lsp-zero.nvim"] = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
+    url = "https://github.com/VonHeikemen/lsp-zero.nvim"
   },
   ["lualine.nvim"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/lualine.nvim",
-    url = "https://gitcode.net/mirrors/nvim-lualine/lualine.nvim"
+    url = "https://github.com/nvim-lualine/lualine.nvim"
+  },
+  ["mason-lspconfig.nvim"] = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
+    url = "https://github.com/williamboman/mason-lspconfig.nvim"
+  },
+  ["mason.nvim"] = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/mason.nvim",
+    url = "https://github.com/williamboman/mason.nvim"
+  },
+  ["null-ls.nvim"] = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
+    url = "https://github.com/jose-elias-alvarez/null-ls.nvim"
+  },
+  ["nvim-autopairs"] = {
+    config = { "\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0" },
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
+    url = "https://github.com/windwp/nvim-autopairs"
+  },
+  ["nvim-cmp"] = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    url = "https://github.com/hrsh7th/nvim-cmp"
+  },
+  ["nvim-lspconfig"] = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    url = "https://github.com/neovim/nvim-lspconfig"
   },
   ["nvim-tree.lua"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/nvim-tree.lua",
-    url = "https://gitcode.net/mirrors/kyazdani42/nvim-tree.lua"
+    url = "https://github.com/kyazdani42/nvim-tree.lua"
   },
   ["nvim-treesitter"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
-    url = "https://gitcode.net/mirrors/nvim-treesitter/nvim-treesitter"
+    url = "https://github.com/nvim-treesitter/nvim-treesitter"
   },
   ["nvim-web-devicons"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
-    url = "https://gitcode.net/mirrors/nvim-tree/nvim-web-devicons"
+    url = "https://github.com/nvim-tree/nvim-web-devicons"
   },
   ["packer.nvim"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/packer.nvim",
-    url = "https://gitcode.net/mirrors/wbthomason/packer.nvim"
+    url = "https://github.com/wbthomason/packer.nvim"
   },
   ["plenary.nvim"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/plenary.nvim",
-    url = "https://gitcode.net/mirrors/nvim-lua/plenary.nvim"
+    url = "https://github.com/nvim-lua/plenary.nvim"
+  },
+  ["prettier.nvim"] = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/prettier.nvim",
+    url = "https://github.com/MunifTanjim/prettier.nvim"
   },
   ["project.nvim"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/project.nvim",
-    url = "https://gitcode.net/mirrors/ahmedkhalf/project.nvim"
+    url = "https://github.com/ahmedkhalf/project.nvim"
   },
   ["telescope.nvim"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/telescope.nvim",
-    url = "https://gitcode.net/mirrors/nvim-telescope/telescope.nvim"
+    url = "https://github.com/nvim-telescope/telescope.nvim"
   },
   ["tokyonight.nvim"] = {
     loaded = true,
     path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/tokyonight.nvim",
-    url = "https://gitcode.net/mirrors/folke/tokyonight.nvim"
+    url = "https://github.com/folke/tokyonight.nvim"
+  },
+  ["vim-floaterm"] = {
+    loaded = true,
+    path = "/Users/sdaduanbilei/.local/share/nvim/site/pack/packer/start/vim-floaterm",
+    url = "https://github.com/voldikss/vim-floaterm"
   }
 }
 
 time([[Defining packer_plugins]], false)
+-- Config for: nvim-autopairs
+time([[Config for nvim-autopairs]], true)
+try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
+time([[Config for nvim-autopairs]], false)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then