From 3d439de0d03c94fad144bf18321843024fc14a8e Mon Sep 17 00:00:00 2001
From: QQ <qyh1510@gmail.com>
Date: Sun, 1 Oct 2023 09:21:32 +0800
Subject: [PATCH] .

---
 .gitignore                       |  2 --
 init.lua                         | 11 +++++------
 lua/neovim/neovim.lua            |  1 +
 lua/neovim/options.lua           |  7 +++++++
 lua/neovim/plugsettings/plug.lua | 12 ++++++++++++
 lua/normal/options.lua           |  5 -----
 lua/normal/plugsettings/plug.lua |  9 +--------
 lua/vscode/keymap.lua            |  0
 lua/vscode/options.lua           |  0
 lua/vscode/plugsettings/plug.lua |  0
 lua/vscode/vscode.lua            |  0
 11 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 lua/neovim/options.lua
 create mode 100644 lua/vscode/keymap.lua
 create mode 100644 lua/vscode/options.lua
 create mode 100644 lua/vscode/plugsettings/plug.lua
 create mode 100644 lua/vscode/vscode.lua

diff --git a/.gitignore b/.gitignore
index eaee1ef..e033bc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-lua/lazy/*
 lazy-lock.json
-nvim 
diff --git a/init.lua b/init.lua
index dc8926c..ec36005 100644
--- a/init.lua
+++ b/init.lua
@@ -16,20 +16,19 @@ G.opt.rtp:prepend(lazypath)
 
 
 if vim.g.vscode then
-  require('Plugin.Imchange')
+  require('vscode.vscode')
 else 
   require('neovim.neovim')
 end
 
 require('normal.normal')
 
-
--- require('vscode')
 -- require('Plugin.coc')
 
-require('Plugin.lualine')
-require('Plugin.Imchange')
-require('Plugin.NERDTree')
+-- require('Plugin.Imchange')
+-- require('Plugin.lualine')
+-- require('Plugin.Imchange')
+-- require('Plugin.NERDTree')
 
 
 
diff --git a/lua/neovim/neovim.lua b/lua/neovim/neovim.lua
index 94609b3..f446d54 100644
--- a/lua/neovim/neovim.lua
+++ b/lua/neovim/neovim.lua
@@ -1,3 +1,4 @@
 require('neovim.plugsettings.plug')
 
 require('neovim.keymap')
+require('neovim.options')
diff --git a/lua/neovim/options.lua b/lua/neovim/options.lua
new file mode 100644
index 0000000..87fece1
--- /dev/null
+++ b/lua/neovim/options.lua
@@ -0,0 +1,7 @@
+local G = require('G')
+
+-- 主题
+G.cmd("colorscheme nord")
+
+-- 背景
+G.opt.background    = 'dark'
diff --git a/lua/neovim/plugsettings/plug.lua b/lua/neovim/plugsettings/plug.lua
index 0a77e39..b6648d2 100644
--- a/lua/neovim/plugsettings/plug.lua
+++ b/lua/neovim/plugsettings/plug.lua
@@ -1,5 +1,17 @@
 require("lazy").setup({
 
+  -- github copilot
+  'github/copilot.vim',
+  -- fzf 
+  'vijaymarupudi/nvim-fzf',
+
+  -- lualine
+  'nvim-lualine/lualine.nvim',
+  
+  -- 主题插件
+  'morhetz/gruvbox',
+  'shaunsingh/nord.nvim',
+
   -- nerdtree
   {
     'preservim/nerdtree',
diff --git a/lua/normal/options.lua b/lua/normal/options.lua
index 572960a..422de0e 100644
--- a/lua/normal/options.lua
+++ b/lua/normal/options.lua
@@ -36,11 +36,6 @@ G.opt.incsearch     = true
 G.opt.textwidth     = 999
 G.opt.wrap          = false
 
--- 背景
-G.opt.background    = 'dark'
-
--- 主题
-G.cmd("colorscheme nord")
 
 -- 文件判断
 G.cmd("filetype plugin indent on")
diff --git a/lua/normal/plugsettings/plug.lua b/lua/normal/plugsettings/plug.lua
index 910ff9c..cc2e2a2 100644
--- a/lua/normal/plugsettings/plug.lua
+++ b/lua/normal/plugsettings/plug.lua
@@ -2,10 +2,7 @@
 
 require("lazy").setup({
 
-  -- 主题插件
-  'nvim-lualine/lualine.nvim',
-  'morhetz/gruvbox',
-  'shaunsingh/nord.nvim',
+  -- 括号箭头
   'yaocccc/nvim-hlchunk',
 
   -- surround 和 wildfire 配合有神奇的效果
@@ -19,13 +16,9 @@ require("lazy").setup({
   -- 多光标
   'terryma/vim-multiple-cursors',
 
-  -- fzf 
-  'vijaymarupudi/nvim-fzf',
 
 
 
-  -- github copilot
-  -- 'github/copilot.vim',
 
   -- 项目管理 {
   --   'Shatur/neovim-session-manager',
diff --git a/lua/vscode/keymap.lua b/lua/vscode/keymap.lua
new file mode 100644
index 0000000..e69de29
diff --git a/lua/vscode/options.lua b/lua/vscode/options.lua
new file mode 100644
index 0000000..e69de29
diff --git a/lua/vscode/plugsettings/plug.lua b/lua/vscode/plugsettings/plug.lua
new file mode 100644
index 0000000..e69de29
diff --git a/lua/vscode/vscode.lua b/lua/vscode/vscode.lua
new file mode 100644
index 0000000..e69de29