Merge branch 'master' of github.com:ChristianChiarulli/LunarVim into stable

1 files changed, 15 insertions, 58 deletions

diff --git a/utils/installer/lv-config.example.lua b/utils/installer/lv-config.example.lua
index f71ad561..71d9dfc8 100644
--- a/utils/installer/lv-config.example.lua
+++ b/utils/installer/lv-config.example.lua
@@ -1,26 +1,27 @@
 --[[
 O is the global options object
 
-Formatters and linters should be
+Linters should be
 filled in as strings with either
 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.colorscheme = 'spacegray'
+O.colorscheme = "spacegray"
 O.auto_close_tree = 0
 O.wrap_lines = false
 O.timeoutlen = 100
 O.document_highlight = true
-O.extras = false
-O.leader_key = ' '
+O.leader_key = " "
 O.ignore_case = true
 O.smart_case = true
 O.lushmode = false
 O.transparent_window = false
 
--- After changing plugin config it is recommended to run :PackerCompile
+-- TODO User Config for predefined plugins
+-- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
 O.plugin.hop.active = false
 O.plugin.dial.active = false
 O.plugin.dashboard.active = true
@@ -46,13 +47,9 @@ O.lang.clang.diagnostics.signs = true
 O.lang.clang.diagnostics.underline = true
 
 -- python
--- add things like O.python.formatter.yapf.exec_path
 -- add things like O.python.linter.flake8.exec_path
--- add things like O.python.formatter.isort.exec_path
-O.lang.python.formatter = 'yapf'
 -- O.python.linter = 'flake8'
 O.lang.python.isort = true
-O.lang.python.autoformat = true
 O.lang.python.diagnostics.virtual_text = true
 O.lang.python.diagnostics.signs = true
 O.lang.python.diagnostics.underline = true
@@ -60,58 +57,18 @@ O.lang.python.analysis.type_checking = "off"
 O.lang.python.analysis.auto_search_paths = true
 O.lang.python.analysis.use_library_code_types = true
 
-
--- lua
--- TODO look into stylua
-O.lang.lua.formatter = 'lua-format'
--- O.lua.formatter = 'lua-format'
-O.lang.lua.autoformat = false
-
 -- javascript
-O.lang.tsserver.formatter = 'prettier'
 O.lang.tsserver.linter = nil
-O.lang.tsserver.autoformat = true
-
--- json
-O.lang.json.autoformat = true
-
--- ruby
-O.lang.ruby.autoformat = true
-
--- go
-O.lang.go.autoformat = true
-
--- rust
-O.lang.rust.autoformat = true
-
--- clang
-O.lang.clang.autoformat = false -- Set to true to enable auto-format in C/C++ files.
-
-
-
--- create custom autocommand field (This would be easy with lua)
-
--- Turn off relative_numbers
--- O.relative_number = false
-
--- Turn off cursorline
--- O.cursorline = false
-
--- Neovim turns the default cursor to 'Block'
--- when switched back into terminal.
--- This below line fixes that. Uncomment if needed.
 
--- vim.cmd('autocmd VimLeave,VimSuspend * set guicursor=a:ver90') -- Beam
--- vim.cmd('autocmd VimLeave,VimSuspend * set guicursor=a:hor20') -- Underline
+-- php
+O.lang.php.environment.php_version = "7.4"
+O.lang.php.diagnostics.signs = true
+O.lang.php.diagnostics.underline = true
+O.lang.php.filetypes = {"php", "phtml"}
 
--- NOTE: Above code doesn't take a value from the terminal's cursor and
---       replace it. It hardcodes the cursor shape.
---       And I think `ver` means vertical and `hor` means horizontal.
---       The numbers didn't make a difference in alacritty. Please change
---       the number to something that suits your needs if it looks weird.
+-- Autocommands (https://neovim.io/doc/user/autocmd.html)
+-- O.user_autocommands = {{ "BufWinEnter", "*", "echo \"hi again\""}}
 
--- TODO
--- custom autocommands
--- user defined plugin config
--- custom settings
+-- Additional Plugins
+-- O.custom_plugins = {{"windwp/nvim-ts-autotag"}}