diff options
Diffstat (limited to 'lua')
| -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 |
3 files changed, 19 insertions, 28 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) |