From ba8c93735b2d051ce859b4313dab140e81bbaa91 Mon Sep 17 00:00:00 2001
From: newbieQQ <1770362456@qq.com>
Date: Sat, 29 Apr 2023 22:30:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4treesitter=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=9B=B4=E6=8D=A2=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lazy-lock.json       |  3 ++-
 lua/core/keymap.lua  | 16 +---------------
 lua/core/options.lua |  2 +-
 lua/core/plug.lua    |  1 +
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index b915c0d..dd44bd8 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -4,9 +4,10 @@
   "copilot.vim": { "branch": "release", "commit": "9e869d29e62e36b7eb6fb238a4ca6a6237e7d78b" },
   "fzf": { "branch": "master", "commit": "3c34dd82750ca61a1ee7f329ed47fe01e6d1ee30" },
   "gruvbox": { "branch": "master", "commit": "bf2885a95efdad7bd5e4794dd0213917770d79b7" },
-  "lazy.nvim": { "branch": "main", "commit": "fdb41229ca39cf2795cbf4e6d04a52b73e6225f5" },
+  "lazy.nvim": { "branch": "main", "commit": "903f0fe542fc35b74f3c09494f9c175346dfa76d" },
   "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" },
   "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
+  "nord.nvim": { "branch": "master", "commit": "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f" },
   "nvim-hlchunk": { "branch": "master", "commit": "269ccdb61818c28a3d53b4851f76aed81bbd22fc" },
   "nvim-treesitter": { "branch": "master", "commit": "dcb9a89ab4f0091bf87aed4e6801423d3667f76a" },
   "vim-commentary": { "branch": "master", "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" },
diff --git a/lua/core/keymap.lua b/lua/core/keymap.lua
index 2361406..d47192d 100644
--- a/lua/core/keymap.lua
+++ b/lua/core/keymap.lua
@@ -1,5 +1,6 @@
 local G, opt = require('G'), {noremap = true}
 
+-- base
 G.map({
 {'n', '<leader>y', '"+y', opt},
 {'n', '<leader>p', '"+p', opt},
@@ -46,21 +47,6 @@ G.map({
 {'n', '<right>',  ':vertical resize +5<CR>', opt},
 })
 
--- lazygit
-G.map({
-{'n', '<leader>g',  ':w<CR>:LazyGit<CR>',           {}},
-})
-
-
-
-G.map({
--- easymotion
-{'v', 's',         '<Plug>(easymotion-bd-f)',      {}},
-{'n', 's',         '<Plug>(easymotion-overwin-f)', {}},
-{'n', '<leader>f', '<Plug>(easymotion-overwin-f2)',{}},
-})
-
-
 --EasyAlign
 G.map({
 {"v", "ga",         ":EasyAlign<CR>",               {}},
diff --git a/lua/core/options.lua b/lua/core/options.lua
index c2344a8..910b494 100644
--- a/lua/core/options.lua
+++ b/lua/core/options.lua
@@ -36,7 +36,7 @@ G.opt.wrap          = false
 G.opt.background    = 'dark'
 
 -- 主题
-G.cmd("colorscheme gruvbox")
+G.cmd("colorscheme nord")
 
 -- 文件判断
 G.cmd("filetype plugin indent on")
diff --git a/lua/core/plug.lua b/lua/core/plug.lua
index 0586aca..613388c 100644
--- a/lua/core/plug.lua
+++ b/lua/core/plug.lua
@@ -22,6 +22,7 @@ require("lazy").setup({
  -- 主题插件
  'nvim-lualine/lualine.nvim',
  'morhetz/gruvbox',
+ 'shaunsingh/nord.nvim',
  'yaocccc/nvim-hlchunk',
 
  -- lsp 补全以及语法高亮