diff --git a/README.md b/README.md index 63470c3..10e70a3 100644 --- a/README.md +++ b/README.md @@ -17,28 +17,4 @@ sudo apt-get install neovim ## 文件结构 ``` -. -├── coc-settings.json -├── init.lua -├── lua -│   ├── core -│   │   ├── filetype.lua -│   │   ├── keymap.lua -│   │   ├── options.lua -│   │   └── plug.lua -│   ├── Filetype -│   │   ├── c.lua -│   │   ├── markdown.lua -│   │   └── vue.lua -│   ├── G.lua -│   └── Plugin -│   ├── ale.lua -│   ├── coc.lua -│   ├── hlchunk.lua -│   ├── Imchange.lua -│   ├── lualine.lua -│   └── treesitter.lua -├── plugin -│   └── packer_compiled.lua -└── README.md ``` diff --git a/init.lua b/init.lua index 0b99843..35be02f 100644 --- a/init.lua +++ b/init.lua @@ -1,9 +1,7 @@ -require('core.plug') -require('core.options') -require('core.keymap') -require('core.filetype') +require ('normal.normal') -require('Plugin.coc') +-- require('vscode') +-- require('Plugin.coc') require('Plugin.lualine') require('Plugin.Imchange') require('Plugin.NERDTree') diff --git a/lua/core/filetype.lua b/lua/core/filetype.lua deleted file mode 100644 index 1bcbe3a..0000000 --- a/lua/core/filetype.lua +++ /dev/null @@ -1,26 +0,0 @@ -local G = require("G") - -G.api.nvim_create_autocmd( {"FileType"}, { - pattern = "markdown", - callback = function() - require('Filetype.markdown') - --G.cmd('MarkdownPreview') - end - } -) - -G.api.nvim_create_autocmd( {"FileType"}, { - pattern = {"c", "cpp"}, - callback = function() - require('Filetype.c') - end - } -) - -G.api.nvim_create_autocmd( {"FileType"}, { - pattern = "vue", - callback = function() - require('Filetype.vue') - end - } -) diff --git a/lua/core/keymap.lua b/lua/normal/keymap.lua similarity index 99% rename from lua/core/keymap.lua rename to lua/normal/keymap.lua index 2556f48..306def5 100644 --- a/lua/core/keymap.lua +++ b/lua/normal/keymap.lua @@ -1,3 +1,4 @@ + local G, opt = require('G'), {noremap = true} -- base diff --git a/lua/normal/normal.lua b/lua/normal/normal.lua new file mode 100644 index 0000000..92e0295 --- /dev/null +++ b/lua/normal/normal.lua @@ -0,0 +1,4 @@ +require('normal.plug') +require('normal.keymap') +require('normal.options') + diff --git a/lua/core/options.lua b/lua/normal/options.lua similarity index 99% rename from lua/core/options.lua rename to lua/normal/options.lua index 5d53e53..572960a 100644 --- a/lua/core/options.lua +++ b/lua/normal/options.lua @@ -39,7 +39,6 @@ G.opt.wrap = false -- 背景 G.opt.background = 'dark' - -- 主题 G.cmd("colorscheme nord") diff --git a/lua/core/plug.lua b/lua/normal/plug.lua similarity index 78% rename from lua/core/plug.lua rename to lua/normal/plug.lua index bbea987..b3f40e2 100644 --- a/lua/core/plug.lua +++ b/lua/normal/plug.lua @@ -1,3 +1,4 @@ + local G = require('G') local lazypath = G.fn.stdpath("data") .. "/lazy/lazy.nvim" @@ -26,8 +27,8 @@ lockfile = false, 'yaocccc/nvim-hlchunk', -- lsp 补全以及语法高亮 - {'neoclide/coc.nvim', branch = 'release'}, - 'nvim-treesitter/nvim-treesitter', + -- {'neoclide/coc.nvim', branch = 'release'}, + -- 'nvim-treesitter/nvim-treesitter', -- surround 和 wildfire 配合有神奇的效果 'tpope/vim-surround', @@ -49,13 +50,13 @@ lockfile = false, }, -- 文件搜索 - 'junegunn/fzf', + -- 'junegunn/fzf', -- 多光标 - 'terryma/vim-multiple-cursors', + -- 'terryma/vim-multiple-cursors', -- github copilot - 'github/copilot.vim', + -- 'github/copilot.vim', -- fzf 'vijaymarupudi/nvim-fzf', @@ -78,16 +79,16 @@ lockfile = false, -- } -- }, - { - 'glepnir/dashboard-nvim', - event = 'VimEnter', - config = function() - require('dashboard').setup { + --{ + -- 'glepnir/dashboard-nvim', + -- event = 'VimEnter', + -- config = function() + -- require('dashboard').setup { -- config - } - end, - dependencies = { {'nvim-tree/nvim-web-devicons'}} - } + -- } + -- end, + -- dependencies = { {'nvim-tree/nvim-web-devicons'}} + -- } })