diff --git a/lazy-lock.json b/lazy-lock.json index b27c391..34eeaea 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,10 +10,10 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "d135c4178bf8980ca5fa4aa6e27ab9ee4373c875" }, "codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" }, + "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, - "gruvbox-baby": { "branch": "main", "commit": "ea71b4225d0140103d99748ca4a33ecf22c03f62" }, "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, "lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" }, "lsp-progress.nvim": { "branch": "main", "commit": "55a04895ea20c365b670051a3128265d43bdfa3d" }, diff --git a/lua/core/config.lua b/lua/core/config.lua deleted file mode 100644 index 4a8ac9f..0000000 --- a/lua/core/config.lua +++ /dev/null @@ -1,68 +0,0 @@ --- local config --- --- -- shim vim for kitty and other generators --- vim = vim or { g = {}, o = {} } --- --- local function opt(key, default) --- key = "pcode_" .. key --- if vim.g[key] == nil then --- return default --- end --- -- if vim.g[key] == 0 then --- -- return false --- -- end --- return vim.g[key] --- end --- --- config = { --- colorscheme = opt("colorscheme", "gruvbox-baby"), --- transparent_mode = opt("transparent_mode", 0), --- clear_lualine = opt("clear_lualine", 0), --- progress = opt("progress", 2), --- lualine_style = opt("lualine_style", 0), --- status_icon = opt("status_icon", 0), --- custom_lualine = opt("custom_lualine", false), --- component_separators = opt("component_separators", { left = " ", right = " " }), --- section_separators = opt("section_separators", { left = " ", right = " " }), --- header1 = opt("header1", nil), --- header2 = opt("header2", nil), --- footer = opt("footer", nil), --- model = opt("model", 1), --- format_on_save = opt("format_on_save", 1), --- lsp_installer = opt("lsp_installer", {}), --- mason_ensure_installed = opt("mason_ensure_installed", {}), --- unregister_lsp = opt("unregister_lsp", {}), --- null_ls_sources = opt("null_ls_sources", {}), --- whichkey = opt("whichkey", {}), --- coderunner = opt("coderunner", {}), --- null_ls_ensure_installed = opt("null_ls_ensure_installed", {}), --- dap_ensure_installed = opt("dap_ensure_installed", {}), --- cmprg = opt("cmprg", false), --- cmpcalc = opt("cmpcalc", false), --- cmptag = opt("cmptag", false), --- lsp_virtualtext = opt("lsp_virtualtext", false), --- lspghost_text = opt("lspghost_text", false), --- loadnvimtree_lazy = opt("loadnvimtree_lazy", false), --- icons = opt("icons", {}), --- } --- --- return config -vim.g.pcode_icons = require("user.icons") -vim.g.pcode_colorscheme = "gruvbox-baby" -vim.g.pcode_transparent_mode = 0 -vim.g.pcode_clear_lualine = 0 -vim.g.pcode_progress = 1 -vim.g.pcode_format_on_save = 1 -vim.g.pcode_lsp_installer = {} -vim.g.pcode_lsp_virtualtext = true -vim.g.pcode_lspghost_text = false -vim.g.pcode_mason_ensure_installed = {} -vim.g.pcode_unregister_lsp = {} -vim.g.pcode_null_ls_ensure_installed = {} -vim.g.pcode_dap_ensure_installed = {} -vim.g.pcode_whichkey = {} -vim.g.pcode_coderunner = {} -vim.g.pcode_cmprg = false -vim.g.pcode_cmpcalc = false -vim.g.pcode_cmptag = false -vim.g.pcode_loadnvimtree_lazy = true diff --git a/lua/core/init.lua b/lua/core/init.lua index cbc11c1..bc53e28 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -1,4 +1,3 @@ -require("core.config") require("custom.default") require("custom.dashboard") require("config.lazy") diff --git a/lua/custom/autocmd.lua b/lua/custom/autocmd.lua index 2b1810a..6845e2f 100644 --- a/lua/custom/autocmd.lua +++ b/lua/custom/autocmd.lua @@ -1,4 +1,4 @@ -local transparent_mode = vim.g.pcode_transparent_mode +local transparent_mode = vim.g.pcode_transparent_mode or 0 if transparent_mode ~= nil then if transparent_mode == 1 then vim.cmd("TransparentDisable") diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 44158c0..b0f7703 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -26,7 +26,6 @@ vim.g.pcode_colorscheme = "dracula" -- nightfox -- 0 =off 1= on vim.g.pcode_transparent_mode = 0 -vim.g.pcode_clear_lualine = 0 -- 0 disable progress -- 1 lualine lsp progress -- 2 fidget progress @@ -101,6 +100,3 @@ vim.g.pcode_coderunner = { vim.g.pcode_cmprg = false --https://github.com/lukas-reineke/cmp-rg vim.g.pcode_cmpcalc = false --https://github.com/hrsh7th/cmp-calc vim.g.pcode_cmptag = false --https://github.com/quangnguyen30192/cmp-nvim-tags - --- load nvim-tree or not -vim.g.pcode_loadnvimtree_lazy = true diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 4b4315b..1fcc559 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -1,7 +1,7 @@ -local cmprg = vim.g.pcode_cmprg -local cmpcalc = vim.g.pcode_cmpcalc -local cmptag = vim.g.pcode_cmptag -local lspghost_text = vim.g.pcode_lspghost_text +local cmprg = vim.g.pcode_cmprg or false +local cmpcalc = vim.g.pcode_cmpcalc or false +local cmptag = vim.g.pcode_cmptag or false +local lspghost_text = vim.g.pcode_lspghost_text or false local icons = require("user.icons").ui return { { "hrsh7th/cmp-nvim-lsp", event = "InsertEnter", lazy = true }, diff --git a/lua/plugins/coderunner.lua b/lua/plugins/coderunner.lua index 297b515..bbe7574 100644 --- a/lua/plugins/coderunner.lua +++ b/lua/plugins/coderunner.lua @@ -10,7 +10,7 @@ local rfile = { javascript = 'node "$dir/$fileName"', } -local runscript = vim.g.pcode_coderunner +local runscript = vim.g.pcode_coderunner or {} rfile = vim.tbl_deep_extend("force", runscript, rfile) return { "CRAG666/code_runner.nvim", diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 27e5b69..5e710e2 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -22,7 +22,7 @@ _G.switch = function(param, case_table) return def and def() or nil end -local color = vim.g.pcode_colorscheme +local color = vim.g.pcode_colorscheme or "gruvbox-baby" switch(color, { ["tokyonight"] = function() gruvbox = false @@ -201,7 +201,7 @@ switch(color, { }) local transparent = false -local transparent_mode = vim.g.pcode_transparent_mode +local transparent_mode = vim.g.pcode_transparent_mode or 0 if transparent_mode ~= nil then if transparent_mode == 1 then transparent = true diff --git a/lua/plugins/transparant.lua b/lua/plugins/transparant.lua index c2ba28a..38f1d1a 100644 --- a/lua/plugins/transparant.lua +++ b/lua/plugins/transparant.lua @@ -1,14 +1,14 @@ local transparent = false local clear_lualine = false -local transparent_mode = vim.g.pcode_transparent_mode +local transparent_mode = vim.g.pcode_transparent_mode or 0 if transparent_mode ~= nil then if transparent_mode == 1 then transparent = true end end -local clear_line = vim.g.pcode_clear_lualine +local clear_line = vim.g.pcode_clear_lualine or 0 if clear_line ~= nil then if clear_line == 1 then clear_lualine = true diff --git a/lua/plugins/whichkey.lua b/lua/plugins/whichkey.lua index 892db7d..13906fb 100644 --- a/lua/plugins/whichkey.lua +++ b/lua/plugins/whichkey.lua @@ -95,7 +95,7 @@ return { nowait = true, -- use `nowait` when creating keymaps } - local wkey = vim.g.pcode_whichkey + local wkey = vim.g.pcode_whichkey or {} local which_key = require("which-key") which_key.setup(opts) which_key.register(require("user.utils.whichkey").mappings, opt) diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua index cb63cb7..25d0292 100644 --- a/lua/user/colorscheme.lua +++ b/lua/user/colorscheme.lua @@ -1,4 +1,4 @@ -local colorscheme = "gruvbox_baby" +local colorscheme = vim.g.pcode_colorscheme or "gruvbox-baby" local lst_style = { "sonokai", "sonokai_atlantis", @@ -23,11 +23,7 @@ local lst_onedark = { "onedark_light", } -if vim.g.pcode_colorscheme ~= nil then - colorscheme = vim.g.pcode_colorscheme -end - -local transparent_mode = vim.g.pcode_transparent_mode +local transparent_mode = vim.g.pcode_transparent_mode or 0 if transparent_mode ~= nil then if transparent_mode == 1 then vim.g.gruvbox_baby_transparent_mode = 1 diff --git a/lua/user/format_onsave.lua b/lua/user/format_onsave.lua index edb61cb..e2a9a95 100644 --- a/lua/user/format_onsave.lua +++ b/lua/user/format_onsave.lua @@ -1,5 +1,5 @@ local run = 0 -local frmt = vim.g.pcode_format_on_save +local frmt = vim.g.pcode_format_on_save or 0 if frmt == 1 then run = 1 else diff --git a/lua/user/lsp/config.lua b/lua/user/lsp/config.lua index 3b85505..45a6457 100644 --- a/lua/user/lsp/config.lua +++ b/lua/user/lsp/config.lua @@ -8,8 +8,8 @@ local lspconfig = require("lspconfig") -- local servers = { "jsonls", "sumneko_lua","html","cssls","tsserver"} -- local servers = { "jdtls", "yamlls" } local servers = {} - -for _, client in pairs(vim.g.pcode_lsp_installer) do +local installer = vim.g.pcode_lsp_installer or {} +for _, client in pairs(installer) do table.insert(servers, client) end diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua index acd5a25..f0ad1e0 100644 --- a/lua/user/lsp/handlers.lua +++ b/lua/user/lsp/handlers.lua @@ -5,7 +5,7 @@ if not status_cmp_ok then return end -local lspvitualtext = vim.g.pcode_lsp_virtualtext +local lspvitualtext = vim.g.pcode_lsp_virtualtext or false local icons = vim.g.pcode_icons M.capabilities = vim.lsp.protocol.make_client_capabilities() diff --git a/lua/user/lsp/mason.lua b/lua/user/lsp/mason.lua index 98dc90b..8c67945 100644 --- a/lua/user/lsp/mason.lua +++ b/lua/user/lsp/mason.lua @@ -11,11 +11,12 @@ local function idxOf(array, value) return nil end -for _, client in pairs(vim.g.pcode_mason_ensure_installed) do +local mason_install = vim.g.pcode_mason_ensure_installed or {} +for _, client in pairs(mason_install) do table.insert(servers, client) end -local unregis_lsp = vim.g.pcode_unregister_lsp +local unregis_lsp = vim.g.pcode_unregister_lsp or {} local icons = vim.g.pcode_icons.ui local settings = { diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua index 5af9922..f5cdd17 100644 --- a/lua/user/lsp/null-ls.lua +++ b/lua/user/lsp/null-ls.lua @@ -21,7 +21,8 @@ if data_ok then end -- load data null-ls -for _, nullls in pairs(vim.g.pcode_null_ls_ensure_installed) do +local nullls_data = vim.g.pcode_null_ls_ensure_installed or {} +for _, nullls in pairs(nullls_data) do table.insert(ensure_installed, nullls) end @@ -33,7 +34,7 @@ if mason_ok then end local run = 0 -local frmt = vim.g.pcode_format_on_save +local frmt = vim.g.pcode_format_on_save or 0 if frmt == 1 then run = 1 end diff --git a/lua/user/mason_dap.lua b/lua/user/mason_dap.lua index 5628f03..e7b4aaa 100644 --- a/lua/user/mason_dap.lua +++ b/lua/user/mason_dap.lua @@ -1,5 +1,6 @@ local sources = {} -for _, nullls in pairs(vim.g.pcode_dap_ensure_installed) do +local dap_data = vim.g.pcode_dap_ensure_installed or {} +for _, nullls in pairs(dap_data) do table.insert(sources, nullls) end require("mason").setup() diff --git a/lua/user/tokyonight.lua b/lua/user/tokyonight.lua index a405336..5f8b4ac 100644 --- a/lua/user/tokyonight.lua +++ b/lua/user/tokyonight.lua @@ -5,7 +5,7 @@ end local transp = false local sidebar = "normal" --"dark , transparent, normal" local hilight = "#292e42" -local tras = vim.g.pcode_transparent_mode +local tras = vim.g.pcode_transparent_mode or 0 if tras == 1 then transp = true sidebar = "transparent"