diff options
| -rw-r--r-- | lua/default-config.lua | 10 | ||||
| -rw-r--r-- | lua/lv-which-key/init.lua | 35 | ||||
| -rw-r--r-- | lua/plugins.lua | 2 | ||||
| -rw-r--r-- | utils/installer/lv-config.example.lua | 41 |
4 files changed, 32 insertions, 56 deletions
diff --git a/lua/default-config.lua b/lua/default-config.lua index 47ee86a1..9d785a4d 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -85,7 +85,9 @@ O = { sanegx = { active = false }, }, - custom_plugins = { + user_which_key = {}, + + user_plugins = { -- use lv-config.lua for this not put here }, @@ -190,7 +192,13 @@ O = { }, }, svelte = {}, + php = { + format = { + format = { + default = "psr12", + }, + }, environment = { php_version = "7.4", }, diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua index 8b3a26e4..f36815b6 100644 --- a/lua/lv-which-key/init.lua +++ b/lua/lv-which-key/init.lua @@ -65,16 +65,12 @@ vim.api.nvim_set_keymap("n", "<Leader>h", ':let @/=""<CR>', { noremap = true, si -- explorer --- TODO this introduces some bugs unfortunately vim.api.nvim_set_keymap( "n", "<Leader>e", ":lua require'lv-nvimtree'.toggle_tree()<CR>", { noremap = true, silent = true } ) --- vim.api.nvim_set_keymap('n', '<Leader>e', --- ":NvimTreeToggle<CR>", --- {noremap = true, silent = true}) vim.api.nvim_set_keymap("n", "<Leader>f", ":Telescope find_files<CR>", { noremap = true, silent = true }) @@ -88,8 +84,6 @@ vim.api.nvim_set_keymap("v", "<leader>/", ":CommentToggle<CR>", { noremap = true -- close buffer vim.api.nvim_set_keymap("n", "<leader>c", ":BufferClose<CR>", { noremap = true, silent = true }) --- TODO create entire treesitter section - local mappings = { ["/"] = "Comment", @@ -128,26 +122,6 @@ local mappings = { s = { "<cmd>PackerSync<cr>", "Sync" }, u = { "<cmd>PackerUpdate<cr>", "Update" }, }, - -- diagnostics vanilla nvim - -- -- diagnostic - -- function lv_utils.get_all() - -- vim.lsp.diagnostic.get_all() - -- end - -- function lv_utils.get_next() - -- vim.lsp.diagnostic.get_next() - -- end - -- function lv_utils.get_prev() - -- vim.lsp.diagnostic.get_prev() - -- end - -- function lv_utils.goto_next() - -- vim.lsp.diagnostic.goto_next() - -- end - -- function lv_utils.goto_prev() - -- vim.lsp.diagnostic.goto_prev() - -- end - -- function lv_utils.show_line_diagnostics() - -- vim.lsp.diagnostic.show_line_diagnostics() - -- end -- " Available Debug Adapters: -- " https://microsoft.github.io/debug-adapter-protocol/implementors/adapters/ @@ -320,5 +294,14 @@ if O.lushmode then } end +-- for _, v in pairs(O.user_which_key) do +-- end +for k, v in pairs(O.user_which_key) do + mappings[k] = v + -- table.insert(mappings, O.user_which_key[1]) + -- print(k) + -- print(v) +end + local wk = require "which-key" wk.register(mappings, opts) diff --git a/lua/plugins.lua b/lua/plugins.lua index 22132956..0c138d32 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -355,7 +355,7 @@ return require("packer").startup(function(use) disable = not O.plugin.ts_hintobjects.active, } - for _, plugin in pairs(O.custom_plugins) do + for _, plugin in pairs(O.user_plugins) do packer.use(plugin) end end) diff --git a/utils/installer/lv-config.example.lua b/utils/installer/lv-config.example.lua index f0aceb55..c4333a4b 100644 --- a/utils/installer/lv-config.example.lua +++ b/utils/installer/lv-config.example.lua @@ -5,7 +5,8 @@ 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 +]] +-- THESE ARE EXAMPLE CONFIGS FEEL FREE TO CHANGE TO WHATEVER YOU WANT -- general O.format_on_save = true O.auto_complete = true @@ -13,12 +14,9 @@ O.colorscheme = "spacegray" O.auto_close_tree = 0 O.wrap_lines = false O.timeoutlen = 100 -O.document_highlight = true O.leader_key = " " O.ignore_case = true O.smart_case = true -O.lushmode = false -O.transparent_window = false -- TODO User Config for predefined plugins -- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile @@ -34,42 +32,29 @@ O.plugin.zen.active = false -- if you don't want all the parsers change this to a table of the ones you want O.treesitter.ensure_installed = "all" -O.treesitter.ignore_install = {"haskell"} +O.treesitter.ignore_install = { "haskell" } O.treesitter.highlight.enabled = true -O.lang.clang.diagnostics.virtual_text = true -O.lang.clang.diagnostics.signs = true -O.lang.clang.diagnostics.underline = true - -- python --- add things like O.python.linter.flake8.exec_path -- O.python.linter = 'flake8' O.lang.python.isort = true O.lang.python.diagnostics.virtual_text = true -O.lang.python.diagnostics.signs = true -O.lang.python.diagnostics.underline = true -O.lang.python.analysis.type_checking = "off" -O.lang.python.analysis.auto_search_paths = true O.lang.python.analysis.use_library_code_types = true -- javascript O.lang.tsserver.linter = nil --- 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"} -O.lang.php.format = { - format = { - default = "psr12" - } -} - +-- Additional Plugins +-- O.custom_plugins = {{"windwp/nvim-ts-autotag"}} -- Autocommands (https://neovim.io/doc/user/autocmd.html) -- O.user_autocommands = {{ "BufWinEnter", "*", "echo \"hi again\""}} --- Additional Plugins --- O.custom_plugins = {{"windwp/nvim-ts-autotag"}} - +-- Additional Leader bindings for WhichKey +-- O.user_which_key = { +-- A = { +-- name = "+Custom Leader Keys", +-- a = { "<cmd>echo 'first custom command'<cr>", "Description for a" }, +-- b = { "<cmd>echo 'second custom command'<cr>", "Description for b" }, +-- }, +-- } |