Merge from main

TonyWu20 · Jun 5, 2024 · f029464 · f029464
2 parents 33e3846 + f751f71
commit f029464
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 11 deletions.
diff --git a/lazy-lock.json b/lazy-lock.json
@@ -22,8 +22,14 @@
   "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
   "crates.nvim": { "branch": "main", "commit": "d556c00d60c9421c913ee54ff690df2a34f6264e" },
   "csv.vim": { "branch": "master", "commit": "962f88787ec6873eba1c7dbbd81d2723f1ee3c4b" },
+<<<<<<< HEAD
   "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
   "dropbar.nvim": { "branch": "master", "commit": "2b546383bdf4daa254ac70c760ee1e5524bc60b1" },
+||||||| 34d096b
+  "diffview.nvim": { "branch": "main", "commit": "1ec7b56b959dab18f7030f541c33ae60e18a6f88" },
+=======
+  "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
+>>>>>>> origin/main
   "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
   "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" },
   "focus.nvim": { "branch": "master", "commit": "c9bc6a969c3ff0d682f389129961c9e71ff2c918" },
@@ -38,8 +44,15 @@
   "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" },
   "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" },
   "lsp-format-modifications.nvim": { "branch": "main", "commit": "006d4cd88f4f09fdc4375fcb75dd5b7d981a723b" },
+<<<<<<< HEAD
+  "lsp_signature.nvim": { "branch": "master", "commit": "8528ff659a2a7a463c0c51383bf7ecf219714413" },
+  "lspsaga.nvim": { "branch": "main", "commit": "d2d5990b224df9cffb7db30e23c33918ef13d2a0" },
+||||||| 34d096b
   "lsp_signature.nvim": { "branch": "master", "commit": "8528ff659a2a7a463c0c51383bf7ecf219714413" },
+  "lspsaga.nvim": { "branch": "main", "commit": "200256d256ca596812b2ee6374244bb4dfe6974e" },
+=======
   "lspsaga.nvim": { "branch": "main", "commit": "d2d5990b224df9cffb7db30e23c33918ef13d2a0" },
+>>>>>>> origin/main
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
@@ -90,7 +103,13 @@
   "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" },
   "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" },
   "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" },
+<<<<<<< HEAD
   "trouble.nvim": { "branch": "main", "commit": "a6f1af567fc987306f0f328e78651bab1bfe874e" },
+||||||| 34d096b
+  "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
+=======
+  "trouble.nvim": { "branch": "main", "commit": "83cfe1b3fd5ebb807119500534d2c8334375a305" },
+>>>>>>> origin/main
   "typst-preview.nvim": { "branch": "master", "commit": "5867db936576741f378b558a9d7428b928819df5" },
   "typst.vim": { "branch": "main", "commit": "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6" },
   "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },

diff --git a/lua/core/event.lua b/lua/core/event.lua
@@ -29,6 +29,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 				vim.lsp.inlay_hint.enable(inlayhints_enabled == true, { bufnr = event.buf })
 			end
 		end
+		vim.lsp.inlay_hint.enable(true)
 	end,
 })
 

diff --git a/lua/modules/configs/completion/cmp.lua b/lua/modules/configs/completion/cmp.lua
@@ -182,10 +182,10 @@ return function()
 			-- { name = "codeium" },
 			-- { name = "cmp_tabnine" },
 		},
-		experimental = {
-			ghost_text = {
-				hl_group = "Whitespace",
-			},
-		},
+		-- experimental = {
+		-- 	ghost_text = {
+		-- 		hl_group = "Whitespace",
+		-- 	},
+		-- },
 	})
 end
diff --git a/lua/modules/configs/editor/zen-mode.lua b/lua/modules/configs/editor/zen-mode.lua
@@ -3,11 +3,11 @@ return function()
 		window = {
 			backdrop = 0.95,
 			width = 85,
-			height = 1,
+			height = 0.8,
 			options = {
 				list = false,
-				foldcolumn = "0",
-				signcolumn = "no",
+				-- foldcolumn = "0",
+				-- signcolumn = "no",
 				cursorcolumn = false,
 				cursorline = false,
 			},

diff --git a/lua/modules/plugins/completion.lua b/lua/modules/plugins/completion.lua
@@ -10,8 +10,8 @@ completion["neovim/nvim-lspconfig"] = {
 		{ "williamboman/mason-lspconfig.nvim" },
 		{ "folke/neoconf.nvim" },
 		{
-			"Jint-lzxy/lsp_signature.nvim",
-			config = require("completion.lsp-signature"),
+			-- "Jint-lzxy/lsp_signature.nvim",
+			-- config = require("completion.lsp-signature"),
 		},
 	},
 }

diff --git a/lua/modules/plugins/lang.lua b/lua/modules/plugins/lang.lua
@@ -35,9 +35,11 @@ lang["preservim/vim-pencil"] = {
 	ft = "markdown",
 }
 lang["frabjous/knap"] = {
+	lazy = true,
 	ft = "tex",
 }
 lang["chomosuke/typst-preview.nvim"] = {
+	lazy = true,
 	ft = "typst",
 	version = "0.1.*",
 	build = function()
@@ -46,6 +48,6 @@ lang["chomosuke/typst-preview.nvim"] = {
 }
 lang["kaarmu/typst.vim"] = {
 	ft = "typst",
-	lazy = false,
+	lazy = true,
 }
 return lang