浏览代码

update need to get rid of message

Chris 4 年之前
父节点
当前提交
e66addc568
共有 2 个文件被更改,包括 60 次插入2 次删除
  1. 58 0
      utils/installer/init.lua.tmp
  2. 2 2
      utils/installer/install-nv-code.sh

+ 58 - 0
utils/installer/init.lua.tmp

@@ -0,0 +1,58 @@
+vim.cmd('set rtp+=~/.config/nvcode')
+if vim.g.vscode then
+  vim.cmd('source ~/.config/nvcode/vimscript/nv-vscode/init.vim')
+  require('settings')
+  require('nv-quickscope')
+else
+  -- General mappings
+  require('plugins')
+  require('keymappings')
+  require('settings')
+  require('colorscheme')
+  require('nv-utils')
+
+  -- Plugins
+  require('nv-compe')
+  require('nv-colorizer')
+  require('nv-nvimtree')
+  require('nv-treesitter')
+  require('nv-barbar')
+  require('nv-quickscope')
+  require('nv-gitsigns')
+  require('nv-nvim-autopairs')
+  require('nv-illuminate')
+  require('nv-neogit')
+  require('nv-comment')
+  require('nv-rnvimr')
+  require('nv-startify')
+  require('nv-telescope')
+  require('nv-floaterm')
+  require('nv-vim-rooter')
+  require('nv-closetag')
+  require('nv-matchup')
+  require('nv-lspkind')
+  require('nv-hop')
+  require('nv-gitblame')
+  require('nv-galaxyline')
+
+  -- Which Key (Hope to replace with Lua plugin someday)
+  vim.cmd('source ~/.config/nvcode/vimscript/nv-whichkey/init.vim')
+  vim.cmd('source ~/.config/nvcode/vimscript/functions.vim')
+
+  -- LSP
+  require('lsp')
+  require('lsp.lua-ls')
+  require('lsp.bash-ls')
+  require('lsp.js-ts-ls')
+  require('lsp.python-ls')
+  require('lsp.json-ls')
+  require('lsp.yaml-ls')
+  require('lsp.vim-ls')
+  require('lsp.graphql-ls')
+  require('lsp.css-ls')
+  require('lsp.docker-ls')
+  require('lsp.html-ls')
+  require('lsp.efm-general-ls')
+  require('lsp.virtual_text')
+end
+

+ 2 - 2
utils/installer/install-nv-code.sh

@@ -63,9 +63,9 @@ installpacker() {
 cloneconfig() {
 	echo "Cloning NVCode configuration"
 	git clone https://github.com/ChristianChiarulli/nvcode.git ~/.config/nvcode
-    mv $HOME/.config/nvcode/init.lua init.lua.tmp
+    mv $HOME/.config/nvcode/init.lua $HOME/.config/nvcode/init.lua.tmp
     mv $HOME/.config/nvcode/utils/init.lua $HOME/.config/nvcode/init.lua
-	nvim --headless +PackerSync +qall
+	nvim -u $HOME/.config/nvcode/init.lua --headless +PackerSync +qall
     rm $HOME/.config/nvcode/init.lua
     mv $HOME/.config/nvcode/init.lua.tmp $HOME/.config/nvcode/init.lua
 }