From 9fd84a85f3e8be7035cf1bf80f22b2dce9b366f0 Mon Sep 17 00:00:00 2001
From: asep komarudin <pojokcodeid@gmail.com>
Date: Fri, 23 Feb 2024 19:49:22 +0700
Subject: [PATCH] fix: disable format if lsp undefined

---
 lazy-lock.json              |  4 ++--
 lua/custom/default.lua      |  2 +-
 lua/plugins/colorscheme.lua | 10 ++++++++++
 lua/user/format_onsave.lua  | 10 ++++++++--
 lua/user/tokyonight.lua     |  3 +++
 lua/user/webdevicons.lua    |  6 ++++++
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index a98c7cf..a8098bb 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -4,6 +4,7 @@
   "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" },
   "bufdelete.nvim": { "branch": "master", "commit": "0b9c0f182b09c51170bb9f252f15de7695e4d507" },
   "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" },
+  "catppuccin": { "branch": "main", "commit": "5e36ca599f4aa41bdd87fbf2c5aae4397ac55074" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
@@ -47,9 +48,8 @@
   "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "smart-splits.nvim": { "branch": "master", "commit": "e1e1e6ca3754bd8ef971fb69673cc17965eb9e37" },
-  "telescope.nvim": { "branch": "master", "commit": "b744cf59752aaa01561afb4223006de26f3836fd" },
+  "telescope.nvim": { "branch": "master", "commit": "a5b69afa484038f1c4793e979d023edb478ebc0c" },
   "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
-  "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" },
   "vim-bbye": { "branch": "master", "commit": "903f5eb17f72ebf7b0b1524bbb792c0b36761af6" },
   "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" },
   "vim-repeat": { "branch": "master", "commit": "8106e142dfdc278ff3eaaadd7b362ad7949d4357" },
diff --git a/lua/custom/default.lua b/lua/custom/default.lua
index a16bbcc..c6b3f03 100644
--- a/lua/custom/default.lua
+++ b/lua/custom/default.lua
@@ -26,7 +26,7 @@ vim.g.pcode_colorscheme = "tokyonight"
 --  dracula
 --  nightfox
 -- 0 =off   1= on
-vim.g.pcode_transparent_mode = 0
+vim.g.pcode_transparent_mode = 1
 
 -- 0 disable progress
 -- 1 lualine lsp progress
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index 3ccdadc..b9bdac4 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -225,8 +225,18 @@ return {
 					-- purple = "#FCC76A",
 					menu = "#282A36",
 				},
+				italic_comment = true,
 				overrides = {
 					NvimTreeFolderIcon = { fg = "#FCC76A" },
+					CmpItemAbbr = { fg = "#ABB2BF" },
+					CmpItemKind = { fg = "#ABB2BF" },
+					CmpItemAbbrDeprecated = { fg = "#ABB2BF" },
+					CmpItemAbbrMatch = { fg = "#8BE9FD" },
+					htmlLink = { fg = "#BD93F9" },
+					Underlined = { fg = "#8BE9FD" },
+					NvimTreeSpecialFile = { fg = "#FF79C6" },
+					MatchParen = { fg = "#F8F8F2" },
+					SpellBad = { fg = "#FF6E6E" },
 				},
 				transparent_bg = transparent,
 			})
diff --git a/lua/user/format_onsave.lua b/lua/user/format_onsave.lua
index c8aca34..f56c6e6 100644
--- a/lua/user/format_onsave.lua
+++ b/lua/user/format_onsave.lua
@@ -7,8 +7,13 @@ if frmt.format_on_save == 1 then
 	run = 1
 end
 
+local buf_clients = vim.lsp.buf_get_clients()
+if next(buf_clients) == nil then
+	run = 0
+end
+
 if run == 1 then
-	function format_filter(client)
+	function FORMAT_FILTER(client)
 		local filetype = vim.bo.filetype
 		local n = require("null-ls")
 		local s = require("null-ls.sources")
@@ -23,11 +28,12 @@ if run == 1 then
 			return false
 		end
 	end
+
 	vim.cmd([[
   augroup _lsp
        autocmd!
        " autocmd BufWritePre * lua vim.lsp.buf.format{timeout_ms =200, filter=format_filter}
-       autocmd BufWritePre * lua vim.lsp.buf.format{timeout_ms=2000 ,filter=format_filter}
+       autocmd BufWritePre * lua vim.lsp.buf.format{timeout_ms=2000 ,filter=FORMAT_FILTER}
     augroup end
   ]])
 end
diff --git a/lua/user/tokyonight.lua b/lua/user/tokyonight.lua
index 59af1a2..3d2c686 100644
--- a/lua/user/tokyonight.lua
+++ b/lua/user/tokyonight.lua
@@ -51,5 +51,8 @@ tokyonight.setup({
 			bg = colors.none,
 			fg = "#e0af68",
 		}
+		highlights.Underlined = {
+			underline = false,
+		}
 	end,
 })
diff --git a/lua/user/webdevicons.lua b/lua/user/webdevicons.lua
index 3f3de4e..f3ae6f0 100644
--- a/lua/user/webdevicons.lua
+++ b/lua/user/webdevicons.lua
@@ -113,6 +113,12 @@ material_icon.setup({
 web_devicons.setup({
 	override = material_icon.get_icons(),
 	override_by_filename = {
+		[".htaccess"] = {
+			icon = "󰛓",
+			color = "#C63C17",
+			cterm_color = "240",
+			name = "htaccess",
+		},
 		[".huskyrc"] = {
 			icon = "󰩃",
 			color = "#ffffff",