changes flask

init.lua

@@ -2,7 +2,7 @@ G = require('G')
 
 
 if G.g.vscode then
-  require('vscode.vscode')
+  require('vscode')
 else
   local lazypath = G.fn.stdpath("data") .. "/lazy/lazy.nvim"
   if not G.loop.fs_stat(lazypath) then
@@ -27,15 +27,12 @@ else
   end
   G.opt.rtp:prepend(lazypath)
 
-  require("lazy").setup({
-    require('normal.plug'),
-    require('neovim.plug'),
-  })
+  require("lazy").setup(require('plugs'))
 
-  require('normal.normal')
-  require('neovim.neovim')
 
 end
 
+require("keymap")
+require("options")
 
 

lua/keymap.lua

@@ -35,14 +35,15 @@ G.map({
 {'n', '<c-l>', '<c-w>l',          opt},
 
 
-{'n', '<c-c>', ':q<CR>',             opt},
-{'n', '<c-s>', ':s<CR>',             opt},
-{'n', '<c-S>', ':w !sudo tee %<CR>', opt},
+{'n', '<c-c>',   ':q<CR>',             opt},
+{'n', '<c-S>',   ':w !sudo tee %<CR>', opt},
+{'n', '<c-q>',   ':q!<CR>',                opt},
 
 
-{'n', '<leader><leader>y', 'ggyG', opt},
-{'n', '<leader><leader>p', 'ggpG', opt},
-{'n', '<leader><leader>v', 'ggVG', opt},
+
+{'n', '<leader>y', 'ggyG', opt},
+{'n', '<leader>p', 'ggpG', opt},
+{'n', '<leader>v', 'ggVG', opt},
 
 {'n', '<up>',     ':res -5<CR>',             opt},
 {'n', '<down>',   ':res +5<CR>',             opt},
@@ -51,8 +52,3 @@ G.map({
 
 })
 
-
-
-
-
-

lua/neovim/keymap.lua

@@ -1 +0,0 @@
-

lua/neovim/neovim.lua

@@ -1,4 +0,0 @@
--- require('neovim.plugsettings.plug')
-
-require('neovim.keymap')
-require('neovim.options')

lua/neovim/options.lua

@@ -1,6 +0,0 @@
-G.cmd("colorscheme tokyonight") -- 主题
-
--- G.api.colorscheme   = "tokyonight"
-G.opt.background    = 'dark' -- 背景
-
-

lua/neovim/plug.lua

@@ -1,24 +0,0 @@
-return {
-
-  'github/copilot.vim',     -- github copilot
-  'vijaymarupudi/nvim-fzf', -- fzf 
-  'lilydjwg/colorizer',     --颜色识别
-
-
-  require('neovim.plugsettings.coc'),  	     -- coc
-  require('neovim.plugsettings.lualine'),    -- lualine
-  require('neovim.plugsettings.nvimtree'),   -- nvimtree
-  require('neovim.plugsettings.treesitter'), -- treesitter
-  require('neovim.plugsettings.theme'),
-
-  -- nerdtree
-  -- {
-  --   'preservim/nerdtree',
-  --   dependencies = {
-  --     'Xuyuanp/nerdtree-git-plugin',
-  --     'ryanoasis/vim-devicons',
-  --   },
-  --   cmd = 'NERDTreeToggle',
-  -- },
-
-}

lua/neovim/plugsettings/theme.lua

@@ -1,5 +0,0 @@
-return {
-  'shaunsingh/nord.nvim',                 -- 主题插件
-  'folke/tokyonight.nvim',
-}
-

lua/normal/normal.lua

@@ -1,4 +0,0 @@
-require('normal.keymap')
-require('normal.options')
-
-

lua/normal/plug.lua

@@ -1,15 +0,0 @@
-return {
-
-
-  -- 多光标
-  'terryma/vim-multiple-cursors',
-  require("normal.plugsettings.edit-plugs"),
-  require("normal.plugsettings.hop"),
-
-}
-
-
-
-
-
-

lua/plugs.lua

@@ -0,0 +1,28 @@
+return {
+
+  'github/copilot.vim',            -- github copilot
+  'vijaymarupudi/nvim-fzf',        -- fzf
+  'lilydjwg/colorizer',            -- 颜色识别
+  'terryma/vim-multiple-cursors',  -- 多光标
+
+
+  require('plugs.coc'),  	     -- coc
+  require('plugs.lualine'),    -- lualine
+  require('plugs.nvimtree'),   -- nvimtree
+  require('plugs.treesitter'), -- treesitter
+  require('plugs.theme'),
+
+  require("plugs.edit-plugs"),
+  require("plugs.hop"),
+
+  -- nerdtree
+  -- {
+  --   'preservim/nerdtree',
+  --   dependencies = {
+  --     'Xuyuanp/nerdtree-git-plugin',
+  --     'ryanoasis/vim-devicons',
+  --   },
+  --   cmd = 'NERDTreeToggle',
+  -- },
+
+}

lua/plugs/theme.lua

@@ -0,0 +1,12 @@
+return {
+  'shaunsingh/nord.nvim',                 -- 主题插件
+  {
+    'folke/tokyonight.nvim',
+    config = function ()
+      G.cmd("colorscheme tokyonight") -- 主题
+      -- G.api.colorscheme   = "tokyonight"
+      G.opt.background    = 'dark' -- 背景
+    end
+  }
+}
+

lua/vscode/keymap.lua

@@ -1,6 +0,0 @@
-local opt = {noremap = true}
-
-G.map({
-  {'n', 'j', 'gj', opt},
-  {'n', 'k', 'gk', opt},
-})

lua/vscode/vscode.lua

@@ -1 +0,0 @@
-require("vscode.keymap")