fix tests and example config

2 files changed, 138 insertions, 130 deletions

diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua
index a9a5086b..657b1fba 100644
--- a/utils/installer/config.example.lua
+++ b/utils/installer/config.example.lua
@@ -33,76 +33,80 @@ lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
 -- -- Change theme settings
 -- lvim.colorscheme = "lunar"
 
-lvim.builtin.alpha.active = true
-lvim.builtin.alpha.mode = "dashboard"
-lvim.builtin.terminal.active = true
-lvim.builtin.nvimtree.opts.view.side = "left"
-lvim.builtin.nvimtree.opts.renderer.icons.show.git = false
-
--- Automatically install missing parsers when entering buffer
-lvim.builtin.treesitter.auto_install = true
-
--- lvim.builtin.treesitter.ignore_install = { "haskell" }
+lvim.builtin.alpha.on_config = function()
+  lvim.builtin.alpha.opts.active = true
+  lvim.builtin.alpha.opts.mode = "dashboard"
+end
+
+lvim.builtin.nvimtree.on_config = function()
+  lvim.builtin.nvimtree.opts.view.side = "left"
+  lvim.builtin.nvimtree.opts.renderer.icons.show.git = false
+end
+
+-- lvim.builtin.treesitter.on_config = function()
+--   lvim.builtin.treesitter.ignore_install = { "haskell" }
+-- end
 
 -- -- generic LSP settings <https://www.lunarvim.org/docs/languages#lsp-support>
-
--- --- disable automatic installation of servers
--- lvim.lsp.installer.setup.automatic_installation = false
-
--- ---configure a server manually. IMPORTANT: Requires `:LvimCacheReset` to take effect
--- ---see the full default list `:lua =lvim.lsp.automatic_configuration.skipped_servers`
--- vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "pyright" })
--- local opts = {} -- check the lspconfig documentation for a list of all possible options
--- require("lvim.lsp.manager").setup("pyright", opts)
-
--- ---remove a server from the skipped list, e.g. eslint, or emmet_ls. IMPORTANT: Requires `:LvimCacheReset` to take effect
--- ---`:LvimInfo` lists which server(s) are skipped for the current filetype
--- lvim.lsp.automatic_configuration.skipped_servers = vim.tbl_filter(function(server)
---   return server ~= "emmet_ls"
--- end, lvim.lsp.automatic_configuration.skipped_servers)
-
--- -- you can set a custom on_attach function that will be used for all the language servers
--- -- See <https://github.com/neovim/nvim-lspconfig#keybindings-and-completion>
--- lvim.lsp.on_attach_callback = function(client, bufnr)
---   local function buf_set_option(...)
---     vim.api.nvim_buf_set_option(bufnr, ...)
+-- lvim.lsp.on_config = function()
+--   --- disable automatic installation of servers
+--   lvim.lsp.installer.setup.automatic_installation = false
+
+--   ---configure a server manually. IMPORTANT: Requires `:LvimCacheReset` to take effect
+--   ---see the full default list `:lua =lvim.lsp.automatic_configuration.skipped_servers`
+--   vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "pyright" })
+--   local opts = {} -- check the lspconfig documentation for a list of all possible options
+--   require("lvim.lsp.manager").setup("pyright", opts)
+
+--   ---remove a server from the skipped list, e.g. eslint, or emmet_ls. IMPORTANT: Requires `:LvimCacheReset` to take effect
+--   ---`:LvimInfo` lists which server(s) are skipped for the current filetype
+--   lvim.lsp.automatic_configuration.skipped_servers = vim.tbl_filter(function(server)
+--     return server ~= "emmet_ls"
+--   end, lvim.lsp.automatic_configuration.skipped_servers)
+
+--   -- you can set a custom on_attach function that will be used for all the language servers
+--   -- See <https://github.com/neovim/nvim-lspconfig#keybindings-and-completion>
+--   lvim.lsp.on_attach_callback = function(client, bufnr)
+--     local function buf_set_option(...)
+--       vim.api.nvim_buf_set_option(bufnr, ...)
+--     end
+--     --Enable completion triggered by <c-x><c-o>
+--     buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
 --   end
---   --Enable completion triggered by <c-x><c-o>
---   buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
--- end
 
--- -- linters and formatters <https://www.lunarvim.org/docs/languages#lintingformatting>
--- local formatters = require "lvim.lsp.null-ls.formatters"
--- formatters.setup {
---   { command = "stylua" },
---   {
---     command = "prettier",
---     extra_args = { "--print-width", "100" },
---     filetypes = { "typescript", "typescriptreact" },
---   },
--- }
--- local linters = require "lvim.lsp.null-ls.linters"
--- linters.setup {
---   { command = "flake8", filetypes = { "python" } },
---   {
---     command = "shellcheck",
---     args = { "--severity", "warning" },
---   },
--- }
-
--- -- Additional Plugins <https://www.lunarvim.org/docs/plugins#user-plugins>
--- lvim.plugins = {
+--   -- linters and formatters <https://www.lunarvim.org/docs/languages#lintingformatting>
+--   local formatters = require "lvim.lsp.null-ls.formatters"
+--   formatters.setup {
+--     { command = "stylua" },
+--     {
+--       command = "prettier",
+--       extra_args = { "--print-width", "100" },
+--       filetypes = { "typescript", "typescriptreact" },
+--     },
+--   }
+--   local linters = require "lvim.lsp.null-ls.linters"
+--   linters.setup {
+--     { command = "flake8", filetypes = { "python" } },
+--     {
+--       command = "shellcheck",
+--       args = { "--severity", "warning" },
+--     },
+--   }
+
+--   -- Additional Plugins <https://www.lunarvim.org/docs/plugins#user-plugins>
+--   lvim.plugins = {
 --     {
 --       "folke/trouble.nvim",
 --       cmd = "TroubleToggle",
 --     },
--- }
-
--- -- Autocommands (`:help autocmd`) <https://neovim.io/doc/user/autocmd.html>
--- vim.api.nvim_create_autocmd("FileType", {
---   pattern = "zsh",
---   callback = function()
---     -- let treesitter use bash highlight for zsh files as well
---     require("nvim-treesitter.highlight").attach(0, "bash")
---   end,
--- })
+--   }
+
+--   -- Autocommands (`:help autocmd`) <https://neovim.io/doc/user/autocmd.html>
+--   vim.api.nvim_create_autocmd("FileType", {
+--     pattern = "zsh",
+--     callback = function()
+--       -- let treesitter use bash highlight for zsh files as well
+--       require("nvim-treesitter.highlight").attach(0, "bash")
+--     end,
+--   })
+-- end
diff --git a/utils/installer/config_win.example.lua b/utils/installer/config_win.example.lua
index 18821d3e..d2a57ab7 100644
--- a/utils/installer/config_win.example.lua
+++ b/utils/installer/config_win.example.lua
@@ -55,76 +55,80 @@ lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
 -- -- Change theme settings
 -- lvim.colorscheme = "lunar"
 
-lvim.builtin.alpha.active = true
-lvim.builtin.alpha.mode = "dashboard"
-lvim.builtin.terminal.active = true
-lvim.builtin.nvimtree.opts.view.side = "left"
-lvim.builtin.nvimtree.opts.renderer.icons.show.git = false
-
--- Automatically install missing parsers when entering buffer
-lvim.builtin.treesitter.auto_install = true
-
--- lvim.builtin.treesitter.ignore_install = { "haskell" }
+lvim.builtin.alpha.on_config = function()
+  lvim.builtin.alpha.opts.active = true
+  lvim.builtin.alpha.opts.mode = "dashboard"
+end
+
+lvim.builtin.nvimtree.on_config = function()
+  lvim.builtin.nvimtree.opts.view.side = "left"
+  lvim.builtin.nvimtree.opts.renderer.icons.show.git = false
+end
+
+-- lvim.builtin.treesitter.on_config = function()
+--   lvim.builtin.treesitter.ignore_install = { "haskell" }
+-- end
 
 -- -- generic LSP settings <https://www.lunarvim.org/docs/languages#lsp-support>
-
--- --- disable automatic installation of servers
--- lvim.lsp.installer.setup.automatic_installation = false
-
--- ---configure a server manually. IMPORTANT: Requires `:LvimCacheReset` to take effect
--- ---see the full default list `:lua =lvim.lsp.automatic_configuration.skipped_servers`
--- vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "pyright" })
--- local opts = {} -- check the lspconfig documentation for a list of all possible options
--- require("lvim.lsp.manager").setup("pyright", opts)
-
--- ---remove a server from the skipped list, e.g. eslint, or emmet_ls. IMPORTANT: Requires `:LvimCacheReset` to take effect
--- ---`:LvimInfo` lists which server(s) are skipped for the current filetype
--- lvim.lsp.automatic_configuration.skipped_servers = vim.tbl_filter(function(server)
---   return server ~= "emmet_ls"
--- end, lvim.lsp.automatic_configuration.skipped_servers)
-
--- -- you can set a custom on_attach function that will be used for all the language servers
--- -- See <https://github.com/neovim/nvim-lspconfig#keybindings-and-completion>
--- lvim.lsp.on_attach_callback = function(client, bufnr)
---   local function buf_set_option(...)
---     vim.api.nvim_buf_set_option(bufnr, ...)
+-- lvim.lsp.on_config = function()
+--   --- disable automatic installation of servers
+--   lvim.lsp.installer.setup.automatic_installation = false
+
+--   ---configure a server manually. IMPORTANT: Requires `:LvimCacheReset` to take effect
+--   ---see the full default list `:lua =lvim.lsp.automatic_configuration.skipped_servers`
+--   vim.list_extend(lvim.lsp.automatic_configuration.skipped_servers, { "pyright" })
+--   local opts = {} -- check the lspconfig documentation for a list of all possible options
+--   require("lvim.lsp.manager").setup("pyright", opts)
+
+--   ---remove a server from the skipped list, e.g. eslint, or emmet_ls. IMPORTANT: Requires `:LvimCacheReset` to take effect
+--   ---`:LvimInfo` lists which server(s) are skipped for the current filetype
+--   lvim.lsp.automatic_configuration.skipped_servers = vim.tbl_filter(function(server)
+--     return server ~= "emmet_ls"
+--   end, lvim.lsp.automatic_configuration.skipped_servers)
+
+--   -- you can set a custom on_attach function that will be used for all the language servers
+--   -- See <https://github.com/neovim/nvim-lspconfig#keybindings-and-completion>
+--   lvim.lsp.on_attach_callback = function(client, bufnr)
+--     local function buf_set_option(...)
+--       vim.api.nvim_buf_set_option(bufnr, ...)
+--     end
+--     --Enable completion triggered by <c-x><c-o>
+--     buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
 --   end
---   --Enable completion triggered by <c-x><c-o>
---   buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
--- end
 
--- -- linters and formatters <https://www.lunarvim.org/docs/languages#lintingformatting>
--- local formatters = require "lvim.lsp.null-ls.formatters"
--- formatters.setup {
---   { command = "stylua" },
---   {
---     command = "prettier",
---     extra_args = { "--print-width", "100" },
---     filetypes = { "typescript", "typescriptreact" },
---   },
--- }
--- local linters = require "lvim.lsp.null-ls.linters"
--- linters.setup {
---   { command = "flake8", filetypes = { "python" } },
---   {
---     command = "shellcheck",
---     args = { "--severity", "warning" },
---   },
--- }
-
--- -- Additional Plugins <https://www.lunarvim.org/docs/plugins#user-plugins>
--- lvim.plugins = {
+--   -- linters and formatters <https://www.lunarvim.org/docs/languages#lintingformatting>
+--   local formatters = require "lvim.lsp.null-ls.formatters"
+--   formatters.setup {
+--     { command = "stylua" },
+--     {
+--       command = "prettier",
+--       extra_args = { "--print-width", "100" },
+--       filetypes = { "typescript", "typescriptreact" },
+--     },
+--   }
+--   local linters = require "lvim.lsp.null-ls.linters"
+--   linters.setup {
+--     { command = "flake8", filetypes = { "python" } },
+--     {
+--       command = "shellcheck",
+--       args = { "--severity", "warning" },
+--     },
+--   }
+
+--   -- Additional Plugins <https://www.lunarvim.org/docs/plugins#user-plugins>
+--   lvim.plugins = {
 --     {
 --       "folke/trouble.nvim",
 --       cmd = "TroubleToggle",
 --     },
--- }
-
--- -- Autocommands (`:help autocmd`) <https://neovim.io/doc/user/autocmd.html>
--- vim.api.nvim_create_autocmd("FileType", {
---   pattern = "zsh",
---   callback = function()
---     -- let treesitter use bash highlight for zsh files as well
---     require("nvim-treesitter.highlight").attach(0, "bash")
---   end,
--- })
+--   }
+
+--   -- Autocommands (`:help autocmd`) <https://neovim.io/doc/user/autocmd.html>
+--   vim.api.nvim_create_autocmd("FileType", {
+--     pattern = "zsh",
+--     callback = function()
+--       -- let treesitter use bash highlight for zsh files as well
+--       require("nvim-treesitter.highlight").attach(0, "bash")
+--     end,
+--   })
+-- end