From 255b14a37176e2072810bc03d160e7ebd6a49d41 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 2 Jul 2021 14:39:36 -0400 Subject: [PATCH] remove lv config so that user settings actually mean something --- .gitignore | 1 + lua/lv-compe/init.lua | 28 ++----------------- utils/installer/install.sh | 2 +- .../installer/lv-config.example.lua | 0 4 files changed, 4 insertions(+), 27 deletions(-) rename lv-config.lua => utils/installer/lv-config.example.lua (100%) diff --git a/.gitignore b/.gitignore index 8b4f7a74..c441ffa0 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ session wiki/ pack/ utils/java/* +lv-config.lua lua-language-server/ eclipse.jdt.ls/ .language-servers/ diff --git a/lua/lv-compe/init.lua b/lua/lv-compe/init.lua index 54ef2310..d0f7efb1 100644 --- a/lua/lv-compe/init.lua +++ b/lua/lv-compe/init.lua @@ -34,32 +34,6 @@ require'compe'.setup { } } ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  ---  --- ﬘ ---  ---  ---  --- m ---  ---  ---  ---  - local t = function(str) return vim.api.nvim_replace_termcodes(str, true, true, true) end @@ -87,6 +61,7 @@ _G.tab_complete = function() return vim.fn['compe#complete']() end end + _G.s_tab_complete = function() if vim.fn.pumvisible() == 1 then return t "" @@ -97,6 +72,7 @@ _G.s_tab_complete = function() end end + vim.api.nvim_set_keymap("i", "", "v:lua.tab_complete()", {expr = true}) vim.api.nvim_set_keymap("s", "", "v:lua.tab_complete()", {expr = true}) vim.api.nvim_set_keymap("i", "", "v:lua.s_tab_complete()", {expr = true}) diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 10373fc3..edf46f09 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -101,7 +101,7 @@ installpacker() { cloneconfig() { echo "Cloning LunarVim configuration" git clone https://github.com/ChristianChiarulli/lunarvim.git ~/.config/nvim - # mv $HOME/.config/nvim/init.lua $HOME/.config/nvim/init.lua.tmp + mv $HOME/.config/nvim/utils/installer/lv-config.example.lua $HOME/.config/nvim/lv-config.lua # mv $HOME/.config/nvim/utils/init.lua $HOME/.config/nvim/init.lua nvim -u $HOME/.config/nvim/init.lua +PackerInstall # rm $HOME/.config/nvim/init.lua diff --git a/lv-config.lua b/utils/installer/lv-config.example.lua similarity index 100% rename from lv-config.lua rename to utils/installer/lv-config.example.lua