diff --git a/coc-settings.json b/coc-settings.json index 0a86578..07e058b 100644 --- a/coc-settings.json +++ b/coc-settings.json @@ -4,6 +4,6 @@ "explorer.icon.enableNerdfont": true, "explorer.toggle": true, "outline.autoWidth": true, - "outline.autoPreview": true, - "outline.togglePreviewKey": "p" + "outline.autoPreview": true + // "outline.togglePreviewKey": "p" } diff --git a/lua/core/plug.lua b/lua/core/plug.lua index 3e60736..a5f0209 100644 --- a/lua/core/plug.lua +++ b/lua/core/plug.lua @@ -20,10 +20,11 @@ return require('packer').startup(function(use) -- 主题插件 use 'nvim-lualine/lualine.nvim' use 'morhetz/gruvbox' - use 'nvim-treesitter/nvim-treesitter' + use 'yaocccc/nvim-hlchunk' - -- lsp 补全 + -- lsp 补全以及语法高亮 use {'neoclide/coc.nvim', branch = 'release'} + use 'nvim-treesitter/nvim-treesitter' -- surround 和 wildfire 配合有神奇的效果 use 'tpope/vim-surround' @@ -49,6 +50,8 @@ return require('packer').startup(function(use) -- 文件搜索 use {'junegunn/fzf'} + -- vue语法高亮 + use 'posva/vim-vue' end) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua new file mode 100644 index 0000000..682e0df --- /dev/null +++ b/plugin/packer_compiled.lua @@ -0,0 +1,179 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end +else + time = function(chunk, start) end +end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + ["coc.nvim"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/coc.nvim", + url = "https://github.com/neoclide/coc.nvim" + }, + colorizer = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/colorizer", + url = "https://github.com/lilydjwg/colorizer" + }, + fzf = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/fzf", + url = "https://github.com/junegunn/fzf" + }, + gruvbox = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/gruvbox", + url = "https://github.com/morhetz/gruvbox" + }, + ["lazygit.nvim"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/lazygit.nvim", + url = "https://github.com/kdheepak/lazygit.nvim" + }, + ["lualine.nvim"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/lualine.nvim", + url = "https://github.com/nvim-lualine/lualine.nvim" + }, + ["markdown-preview.nvim"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim", + url = "https://github.com/iamcco/markdown-preview.nvim" + }, + ["nvim-hlchunk"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/nvim-hlchunk", + url = "https://github.com/yaocccc/nvim-hlchunk" + }, + ["nvim-treesitter"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + ["vim-commentary"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-commentary", + url = "https://github.com/tpope/vim-commentary" + }, + ["vim-easy-align"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-easy-align", + url = "https://github.com/junegunn/vim-easy-align" + }, + ["vim-easymotion"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-easymotion", + url = "https://github.com/easymotion/vim-easymotion" + }, + ["vim-surround"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-surround", + url = "https://github.com/tpope/vim-surround" + }, + ["vim-vue"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-vue", + url = "https://github.com/posva/vim-vue" + }, + vimwiki = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vimwiki", + url = "https://github.com/vimwiki/vimwiki" + }, + ["wildfire.vim"] = { + loaded = true, + path = "/home/newbie/.local/share/nvim/site/pack/packer/start/wildfire.vim", + url = "https://github.com/gcmt/wildfire.vim" + } +} + +time([[Defining packer_plugins]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end