diff --git a/lazy-lock.json b/lazy-lock.json index ef46a9c..5d1e6f0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,7 @@ { "Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" }, "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, + "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" }, "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -32,7 +32,6 @@ "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-material-icon": { "branch": "main", "commit": "602088c2682e61cbebd7191de7dc88bfa90c6890" }, diff --git a/lua/custom/plugins/codeium.lua b/lua/custom/plugins/codeium.lua index c5cb818..5328871 100644 --- a/lua/custom/plugins/codeium.lua +++ b/lua/custom/plugins/codeium.lua @@ -2,7 +2,8 @@ vim.g.codeium_disable_bindings = 1 return { "Exafunction/codeium.vim", enabled = true, - event = "BufEnter", + -- event = "BufEnter", + event = "InsertEnter", config = function() -- Change '' here to any keycode you like. vim.keymap.set("i", "", function() diff --git a/lua/custom/plugins/java.lua b/lua/custom/plugins/java.lua index f86b1cd..baa950c 100644 --- a/lua/custom/plugins/java.lua +++ b/lua/custom/plugins/java.lua @@ -1 +1,3 @@ -return { "mfussenegger/nvim-jdtls", event = "BufRead" } +return { + -- { "mfussenegger/nvim-jdtls", event = "BufRead" }, +} diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 496a6a2..cf7dd55 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -118,7 +118,7 @@ return { "MasonUninstallAll", "MasonLog", }, - keys = { { "cm", "Mason", desc = "Mason" } }, + -- keys = { { "cm", "Mason", desc = "Mason" } }, config = function() require("user.lsp") end, @@ -182,7 +182,8 @@ return { { "JoosepAlviste/nvim-ts-context-commentstring", lazy = true, - event = "BufWinEnter", + -- event = "BufWinEnter", + event = "InsertEnter", dependencies = "nvim-treesitter/nvim-treesitter", config = function() require("ts_context_commentstring").setup({ @@ -192,7 +193,8 @@ return { }, { "numToStr/Comment.nvim", - event = "BufWinEnter", + -- event = "BufWinEnter", + event = "InsertEnter", config = function() require("user.comment") end, @@ -253,7 +255,8 @@ return { -- for auto close tag { "windwp/nvim-ts-autotag", - event = "BufWinEnter", + -- event = "BufWinEnter", + event = "BufRead", dependencies = "nvim-treesitter/nvim-treesitter", config = function() require("nvim-ts-autotag").setup() diff --git a/lua/custom/plugins/transparant.lua b/lua/plugins/transparant.lua similarity index 56% rename from lua/custom/plugins/transparant.lua rename to lua/plugins/transparant.lua index 445c20c..81c08ba 100644 --- a/lua/custom/plugins/transparant.lua +++ b/lua/plugins/transparant.lua @@ -1,21 +1,32 @@ +local transparent = false +local clear_lualine = false +local data_exists, config = pcall(require, "core.config") +if not data_exists then + return +end + +local transparent_mode = config.transparent_mode +if transparent_mode ~= nil then + if transparent_mode == 1 then + transparent = true + end +end + +local clear_line = config.clear_lualine +if clear_line ~= nil then + if clear_line == 1 then + clear_lualine = true + end +end + return { -- transparant config { "xiyaowong/transparent.nvim", + enabled = transparent, event = "BufWinEnter", cmd = { "TransparentToggle", "TransparentEnable", "TransparentDisable" }, config = function() - require("transparent").clear_prefix("BufferLine") - -- clear prefix for which-key - require("transparent").clear_prefix("WhichKey") - -- clear prefix for lazy.nvim - require("transparent").clear_prefix("Lazy") - -- clear prefix for NvimTree - require("transparent").clear_prefix("NvimTree") - -- clear prefix for NeoTree - require("transparent").clear_prefix("NeoTree") - -- clear prefix for Lualine - require("transparent").clear_prefix("Lualine") require("transparent").setup({ extra_groups = {}, exclude_groups = { @@ -30,6 +41,23 @@ return { "NeoTreeCursorLine", }, }) + require("transparent").clear_prefix("BufferLine") + -- clear prefix for which-key + require("transparent").clear_prefix("WhichKey") + -- clear prefix for lazy.nvim + require("transparent").clear_prefix("Lazy") + -- clear prefix for NvimTree + require("transparent").clear_prefix("NvimTree") + -- clear prefix for NeoTree + require("transparent").clear_prefix("NeoTree") + if clear_lualine then + -- clear prefix for Lualine + require("transparent").clear_prefix("Lualine") + end + -- clear prefix for Telescope + require("transparent").clear_prefix("Telescope") + -- create auto command to set transparent + vim.cmd("TransparentEnable") end, }, } diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua index b4cd5db..d84b4c0 100644 --- a/lua/user/whichkey.lua +++ b/lua/user/whichkey.lua @@ -17,11 +17,11 @@ function _NODE_TOGGLE() node:toggle() end -function _NCDU_TOGGLE() - local Terminal = require("toggleterm.terminal").Terminal - local ncdu = Terminal:new({ cmd = "ncdu", hidden = true }) - ncdu:toggle() -end +-- function _NCDU_TOGGLE() +-- local Terminal = require("toggleterm.terminal").Terminal +-- local ncdu = Terminal:new({ cmd = "ncdu", hidden = true }) +-- ncdu:toggle() +-- end function _HTOP_TOGGLE() local Terminal = require("toggleterm.terminal").Terminal @@ -175,6 +175,7 @@ if vim.fn.has("win32") == 1 then end -- for debug local debug_key = {} +local trasparant = {} -- local is_dap = pcall(require, "dap") function _close_buffer() @@ -183,6 +184,11 @@ function _close_buffer() require("bufdelete").bufdelete(buf, true) end +local trans_ok, _ = pcall(require, "transparent") +if trans_ok then + trasparant = { "TransparentToggle", "Toggle Transparency" } +end + if vim.fn.has("win32") == 0 then debug_key = { name = "  Debug", @@ -207,6 +213,7 @@ local mappings2 = { ["/"] = { "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", "󰆈 Commet Block" }, } local mappings = { + ["c"] = trasparant, ["a"] = { "Alpha", "󰕮 Alpha" }, ["b"] = { "lua require('telescope.builtin').buffers(require('telescope.themes').get_dropdown{previewer = false})", @@ -323,7 +330,7 @@ local mappings = { -- l = { "ToggleTerm direction=tablive-server", "Live Server" }, x = { "ToggleTermToggleAll!", "Close Tab" }, n = { "lua _NODE_TOGGLE()", "Node" }, - u = { "lua _NCDU_TOGGLE()", "NCDU" }, + -- u = { "lua _NCDU_TOGGLE()", "NCDU" }, -- t = { "lua _HTOP_TOGGLE()", "Htop" }, b = { "lua _BTOP_TOGGLE()", "Btop" }, -- B = { "lua _BTM_TOGGLE()", "Boottom" },