LunarVim 0.4.8 (#919)0.4.8

4 files changed, 57 insertions, 30 deletions

diff --git a/utils/installer/install.sh b/utils/installer/install.sh
index dedd1dc8..0473bbab 100755
--- a/utils/installer/install.sh
+++ b/utils/installer/install.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-
+#Set Variable to master is not set differently
+LVBRANCH="${LVBRANCH:-master}"
 set -o nounset # error when referencing undefined variable
 set -o errexit # exit when command fails
 
@@ -100,7 +101,7 @@ installpacker() {
 
 cloneconfig() {
     echo "Cloning LunarVim configuration"
-    git clone --branch master https://github.com/ChristianChiarulli/lunarvim.git ~/.config/nvim
+    git clone --branch $LVBRANCH https://github.com/ChristianChiarulli/lunarvim.git ~/.config/nvim
     cp $HOME/.config/nvim/utils/installer/lv-config.example-no-ts.lua $HOME/.config/nvim/lv-config.lua
     nvim --headless \
         +'autocmd User PackerComplete sleep 100m | qall' \
@@ -181,6 +182,13 @@ installextrapackages() {
 # Welcome
 echo 'Installing LunarVim'
 
+if [[ $* == *--overwrite* ]]; then
+  echo '!!Warning!! -> Removing all nvim related config because of the --overwrite flag'
+  rm -rf "$HOME/.config/nvim"
+  rm -rf "$HOME/.cache/nvim"
+  rm -rf "$HOME/.local/share/nvim/site/pack/packer"
+fi
+
 # move old nvim directory if it exists
 [ -d "$HOME/.config/nvim" ] && moveoldnvim
 
diff --git a/utils/installer/lv-config.example-no-ts.lua b/utils/installer/lv-config.example-no-ts.lua
index 3c7fecb1..33d9f433 100644
--- a/utils/installer/lv-config.example-no-ts.lua
+++ b/utils/installer/lv-config.example-no-ts.lua
@@ -7,28 +7,23 @@ a global executable or a path to
 an executable
 ]]
 -- THESE ARE EXAMPLE CONFIGS FEEL FREE TO CHANGE TO WHATEVER YOU WANT
+
 -- general
+
 O.format_on_save = true
-O.auto_complete = true
+O.completion.autocomplete = true
 O.colorscheme = "spacegray"
 O.auto_close_tree = 0
-O.wrap_lines = false
-O.timeoutlen = 100
+O.default_options.wrap = true
+O.default_options.timeoutlen = 100
 O.leader_key = " "
-O.ignore_case = true
-O.smart_case = true
 
--- TODO User Config for predefined plugins
+-- TODO: User Config for predefined plugins
 -- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
 O.plugin.dashboard.active = true
-O.plugin.colorizer.active = false
-O.plugin.ts_playground.active = false
-O.plugin.indent_line.active = false
+O.plugin.floatterm.active = true
 O.plugin.zen.active = false
-
--- dashboard
--- O.dashboard.custom_header = {""}
--- O.dashboard.footer = {""}
+O.plugin.zen.window.height = 0.90
 
 -- if you don't want all the parsers change this to a table of the ones you want
 O.treesitter.ensure_installed = {}
@@ -40,10 +35,22 @@ O.treesitter.highlight.enabled = true
 O.lang.python.isort = true
 O.lang.python.diagnostics.virtual_text = true
 O.lang.python.analysis.use_library_code_types = true
+-- to change default formatter from yapf to black
+-- O.lang.python.formatter.exe = "black"
+-- O.lang.python.formatter.args = {"-"}
+
+-- go
+-- to change default formatter from gofmt to goimports
+-- O.lang.formatter.go.exe = "goimports"
 
 -- javascript
 O.lang.tsserver.linter = nil
 
+-- latex
+-- O.lang.latex.auto_save = false
+-- O.lang.latex.ignore_errors = { }
+
+
 -- Additional Plugins
 -- O.user_plugins = {
 --     {"folke/tokyonight.nvim"}, {
diff --git a/utils/installer/lv-config.example.lua b/utils/installer/lv-config.example.lua
index b61a0271..7072c60c 100644
--- a/utils/installer/lv-config.example.lua
+++ b/utils/installer/lv-config.example.lua
@@ -7,28 +7,23 @@ a global executable or a path to
 an executable
 ]]
 -- THESE ARE EXAMPLE CONFIGS FEEL FREE TO CHANGE TO WHATEVER YOU WANT
+
 -- general
+
 O.format_on_save = true
-O.auto_complete = true
+O.completion.autocomplete = true
 O.colorscheme = "spacegray"
 O.auto_close_tree = 0
-O.wrap_lines = false
-O.timeoutlen = 100
+O.default_options.wrap = true
+O.default_options.timeoutlen = 100
 O.leader_key = " "
-O.ignore_case = true
-O.smart_case = true
 
--- TODO User Config for predefined plugins
+-- TODO: User Config for predefined plugins
 -- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
 O.plugin.dashboard.active = true
-O.plugin.colorizer.active = false
-O.plugin.ts_playground.active = false
-O.plugin.indent_line.active = false
+O.plugin.floatterm.active = true
 O.plugin.zen.active = false
-
--- dashboard
--- O.dashboard.custom_header = {""}
--- O.dashboard.footer = {""}
+O.plugin.zen.window.height = 0.90
 
 -- if you don't want all the parsers change this to a table of the ones you want
 O.treesitter.ensure_installed = "maintained"
@@ -36,14 +31,31 @@ O.treesitter.ignore_install = { "haskell" }
 O.treesitter.highlight.enabled = true
 
 -- python
--- O.python.linter = 'flake8'
+-- O.lang.python.linter = 'flake8'
 O.lang.python.isort = true
 O.lang.python.diagnostics.virtual_text = true
 O.lang.python.analysis.use_library_code_types = true
+-- to change default formatter from yapf to black
+-- O.lang.python.formatter.exe = "black"
+-- O.lang.python.formatter.args = {"-"}
+
+-- go
+-- to change default formatter from gofmt to goimports
+-- O.lang.formatter.go.exe = "goimports"
 
 -- javascript
 O.lang.tsserver.linter = nil
 
+-- rust
+-- O.lang.rust.formatter = {
+--   exe = "rustfmt",
+--   args = {"--emit=stdout", "--edition=2018"},
+-- }
+
+-- latex
+-- O.lang.latex.auto_save = false
+-- O.lang.latex.ignore_errors = { }
+
 -- Additional Plugins
 -- O.user_plugins = {
 --     {"folke/tokyonight.nvim"}, {
diff --git a/utils/lv-vscode/init.vim b/utils/lv-vscode/init.vim
index 1aa30934..d85184ea 100644
--- a/utils/lv-vscode/init.vim
+++ b/utils/lv-vscode/init.vim
@@ -1,6 +1,6 @@
 " packadd quickscope
 
-execute 'luafile ' . stdpath('config') . '/lua/settings.lua'
+" execute 'luafile ' . stdpath('config') . '/lua/settings.lua'
 
 function! s:manageEditorSize(...)
     let count = a:1