Jelajahi Sumber

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

christianchiarulli 4 tahun lalu
induk
melakukan
82c24bd832
6 mengubah file dengan 33 tambahan dan 18 penghapusan
  1. 1 13
      init.lua
  2. 4 4
      lua/lv-dashboard/init.lua
  3. 16 0
      lua/lv-neoformat/init.lua
  4. 1 0
      lua/lv-utils/init.lua
  5. 10 0
      lua/lv-which-key/init.lua
  6. 1 1
      lua/plugins.lua

+ 1 - 13
init.lua

@@ -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

+ 4 - 4
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'"

+ 16 - 0
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

+ 1 - 0
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

+ 10 - 0
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" },

+ 1 - 1
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,