diff options
| -rw-r--r-- | init.lua | 14 | ||||
| -rw-r--r-- | lua/lv-dashboard/init.lua | 8 | ||||
| -rw-r--r-- | lua/lv-neoformat/init.lua | 16 | ||||
| -rw-r--r-- | lua/lv-utils/init.lua | 1 | ||||
| -rw-r--r-- | lua/lv-which-key/init.lua | 10 | ||||
| -rw-r--r-- | lua/plugins.lua | 2 |
6 files changed, 33 insertions, 18 deletions
@@ -7,6 +7,7 @@ require "lv-utils" require "lv-galaxyline" require "lv-treesitter" require "lv-which-key" +require "lv-neoformat" require "lsp" if O.lang.emmet.active then require "lsp.emmet-ls" @@ -14,16 +15,3 @@ end if O.lang.tailwindcss.active then require "lsp.tailwindcss-ls" end - --- autoformat -if O.format_on_save then - require("lv-utils").define_augroups { - autoformat = { - { - "BufWritePre", - "*", - [[try | undojoin | Neoformat | catch /^Vim\%((\a\+)\)\=:E790/ | finally | silent Neoformat | endtry]], - }, - }, - } -end diff --git a/lua/lv-dashboard/init.lua b/lua/lv-dashboard/init.lua index 7a6c77cd..d9511e90 100644 --- a/lua/lv-dashboard/init.lua +++ b/lua/lv-dashboard/init.lua @@ -28,10 +28,10 @@ M.config = function() description = { " Settings " }, command = ":e " .. CONFIG_PATH .. "/lv-config.lua", }, - f = { - description = { " Neovim Config Files" }, - command = "Telescope find_files cwd=" .. CONFIG_PATH, - }, + -- f = { + -- description = { " Neovim Config Files" }, + -- command = "Telescope find_files cwd=" .. CONFIG_PATH, + -- }, -- e = {description = {' Marks '}, command = 'Telescope marks'} } vim.cmd "let g:dashboard_session_directory = $HOME..'/.config/nvim/.sessions'" diff --git a/lua/lv-neoformat/init.lua b/lua/lv-neoformat/init.lua new file mode 100644 index 00000000..a1540370 --- /dev/null +++ b/lua/lv-neoformat/init.lua @@ -0,0 +1,16 @@ +-- autoformat +if O.format_on_save then + require("lv-utils").define_augroups { + autoformat = { + { + "BufWritePre", + "*", + [[try | undojoin | Neoformat | catch /^Vim\%((\a\+)\)\=:E790/ | finally | silent Neoformat | endtry]], + }, + }, + } +end + +if not O.format_on_save then + vim.cmd ":autocmd! autoformat" +end diff --git a/lua/lv-utils/init.lua b/lua/lv-utils/init.lua index 656905f2..9caccd82 100644 --- a/lua/lv-utils/init.lua +++ b/lua/lv-utils/init.lua @@ -3,6 +3,7 @@ local lv_utils = {} function lv_utils.reload_lv_config() vim.cmd "source ~/.config/nvim/lv-config.lua" vim.cmd "source ~/.config/nvim/lua/plugins.lua" + vim.cmd "source ~/.config/nvim/lua/lv-neoformat/init.lua" vim.cmd ":PackerCompile" vim.cmd ":PackerInstall" end diff --git a/lua/lv-which-key/init.lua b/lua/lv-which-key/init.lua index f36815b6..984cd202 100644 --- a/lua/lv-which-key/init.lua +++ b/lua/lv-which-key/init.lua @@ -84,13 +84,23 @@ 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 }) +-- open lv-config +vim.api.nvim_set_keymap( + "n", + "<leader>.", + ":e " .. CONFIG_PATH .. "/lv-config.lua<CR>", + { noremap = true, silent = true } +) + local mappings = { + ["."] = "LunarConfig", ["/"] = "Comment", ["c"] = "Close Buffer", ["e"] = "Explorer", ["f"] = "Find File", ["h"] = "No Highlight", + [";"] = "Dashboard", b = { name = "Buffers", j = { "<cmd>BufferPick<cr>", "jump to buffer" }, diff --git a/lua/plugins.lua b/lua/plugins.lua index 0c138d32..e675b200 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -127,7 +127,7 @@ return require("packer").startup(function(use) use { "ChristianChiarulli/dashboard-nvim", event = "BufWinEnter", - cmd = { "Dashboard", "DashboardNewFile", "DashboardJumpMarks" }, + -- cmd = { "Dashboard", "DashboardNewFile", "DashboardJumpMarks" }, config = function() require("lv-dashboard").config() end, |