diff --git a/lazy-lock.json b/lazy-lock.json index 1704076..34eeaea 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -14,7 +14,7 @@ "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" }, "lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" }, "lsp-progress.nvim": { "branch": "main", "commit": "55a04895ea20c365b670051a3128265d43bdfa3d" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, @@ -37,7 +37,7 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" }, - "nvim-treesitter": { "branch": "master", "commit": "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56" }, + "nvim-treesitter": { "branch": "master", "commit": "73fb37ed77b18ac357ca8e6e35835a8db6602332" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" }, "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cbab9ad88036915beebd13b47e100743ff2ed2d5" }, diff --git a/lua/core/config.lua b/lua/core/config.lua index 02a41eb..447e6ab 100644 --- a/lua/core/config.lua +++ b/lua/core/config.lua @@ -43,6 +43,7 @@ config = { lsp_virtualtext = opt("lsp_virtualtext", false), lspghost_text = opt("lspghost_text", false), loadnvimtree_lazy = opt("loadnvimtree_lazy", false), + icons = opt("icons", {}), } return config diff --git a/lua/custom/default.lua b/lua/custom/default.lua index d6ae3c9..ee71ae1 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -1,3 +1,4 @@ +vim.g.pcode_icons = require("user.icons") -- custom colorscheme -- colorscheme ready : -- tokyonight, tokyonight-night, tokyonight-storm, tokyonight-day, tokyonight-moon @@ -77,24 +78,17 @@ vim.g.pcode_dap_ensure_installed = { } -- https://github.com/folke/which-key.nvim --- vim.g.pcode_whichkey = { --- contoh penambahan --- ["k"] = { --- name = "Example", --- k = { 'lua print("Testing")', "Example" }, --- }, --- ["r"] = { --- name = "Run", --- j = { "Jaq float", "Run With Jaq" }, --- }, --- ["o"] = { "SymbolsOutline", "Symbol Outline" }, --- ["m"] = { --- name = "Minimap", --- c = { "lua require('mini.map').close()", "Minimap Close" }, --- o = { "lua require('mini.map').open()", "Minimap Open" }, --- }, --- ["e"] = { "NvimTreeToggle", "Explorer" }, --- } +vim.g.pcode_whichkey = { + -- contoh penambahan + ["k"] = { + name = "Example", + k = { 'lua print("Testing")', "Example" }, + }, + ["r"] = { + name = "Run", + j = { "Jaq float", "Run With Jaq" }, + }, +} -- https://github.com/CRAG666/code_runner.nvim -- ready default java, python, typescript, javascript, rust, cpp, scss diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 88b8ffe..57ffda5 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -1,4 +1,4 @@ -local icons = require("user.icons") +local icons = vim.g.pcode_icons return { --- masukan plugin tambahan disini -- { diff --git a/lua/custom/plugins/nvimufo.lua b/lua/custom/plugins/nvimufo.lua index 2ee59ad..f3af38f 100644 --- a/lua/custom/plugins/nvimufo.lua +++ b/lua/custom/plugins/nvimufo.lua @@ -8,7 +8,7 @@ function TABLE_CONTAINS(tbl, x) return found end -local icons = require("user.icons").folding +local icons = vim.g.pcode_icons.folding return { "kevinhwang91/nvim-ufo", diff --git a/lua/plugins/bufferline.lua b/lua/plugins/bufferline.lua index 3da85fa..f93e407 100644 --- a/lua/plugins/bufferline.lua +++ b/lua/plugins/bufferline.lua @@ -8,7 +8,7 @@ return { return end - local icons = require("user.icons") + local icons = vim.g.pcode_icons local use_icons = true -- get folder name from current directory diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index a218488..fb5894b 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -1,15 +1,9 @@ -local cmprg = false -local cmpcalc = false -local cmptag = false -local lspghost_text = false -local icons = require("user.icons").ui -local data_exists, custom_cmp = pcall(require, "core.config") -if data_exists then - cmprg = custom_cmp.cmprg - cmpcalc = custom_cmp.cmpcalc - cmptag = custom_cmp.cmptag - lspghost_text = custom_cmp.lspghost_text -end +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 icons = vim.g.pcode_icons.ui + return { { "hrsh7th/cmp-nvim-lsp", event = "InsertEnter", lazy = true }, { "hrsh7th/cmp-buffer", event = "InsertEnter", lazy = true }, @@ -90,7 +84,7 @@ return { formatting = { fields = { "kind", "abbr", "menu" }, format = function(entry, vim_item) - vim_item.kind = string.format("%s", require("user.icons")["kind"][vim_item.kind]) + vim_item.kind = string.format("%s", vim.g.pcode_icons["kind"][vim_item.kind]) vim_item.menu = ({ nvim_lsp = "(LSP)", luasnip = "(Snippet)", diff --git a/lua/plugins/coderunner.lua b/lua/plugins/coderunner.lua index 74f2b3d..297b515 100644 --- a/lua/plugins/coderunner.lua +++ b/lua/plugins/coderunner.lua @@ -1,21 +1,17 @@ +--typescript = "deno run", +-- cpp="gcc $fileName -lstdc++ -o $fileNameWithoutExt && $fileNameWithoutExt" local rfile = { java = "cd $dir && javac $fileName && java $fileNameWithoutExt", python = "python3 -u", - --typescript = "deno run", - typescript = "ts-node $dir/$fileName", -- npm install -g ts-node + typescript = "ts-node $dir/$fileName", rust = "cd $dir && rustc $fileName && $dir/$fileNameWithoutExt", - -- cpp="gcc $fileName -lstdc++ -o $fileNameWithoutExt && $fileNameWithoutExt" cpp = "cd $dir && g++ $fileName -o $fileNameWithoutExt && $dir/$fileNameWithoutExt", scss = "sass $dir/$fileName $dir/$fileNameWithoutExt.css", javascript = 'node "$dir/$fileName"', } -local data_exists, runscript = pcall(require, "core.config") -if data_exists then - if runscript.coderunner ~= nil then - rfile = vim.tbl_deep_extend("force", runscript.coderunner, rfile) - end -end +local runscript = vim.g.pcode_coderunner +rfile = vim.tbl_deep_extend("force", runscript, rfile) return { "CRAG666/code_runner.nvim", lazy = true, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 3655137..e65fd6c 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -22,191 +22,186 @@ _G.switch = function(param, case_table) return def and def() or nil end -local data_exists, config = pcall(require, "core.config") -if data_exists then - if config.colorscheme ~= nil then - local color = config.colorscheme - switch(color, { - ["tokyonight"] = function() - gruvbox = false - tokyonight = true - end, - ["tokyonight-night"] = function() - gruvbox = false - tokyonight = true - end, - ["tokyonight-storm"] = function() - gruvbox = false - tokyonight = true - end, - ["tokyonight-day"] = function() - gruvbox = false - tokyonight = true - end, - ["tokyonight-moon"] = function() - gruvbox = false - tokyonight = true - end, - ["sonokai"] = function() - gruvbox = false - sonokai = true - sonokai_style = "default" - end, - ["sonokai_atlantis"] = function() - gruvbox = false - sonokai = true - sonokai_style = "atlantis" - end, - ["sonokai_andromeda"] = function() - gruvbox = false - sonokai = true - sonokai_style = "andromeda" - end, - ["sonokai_shusia"] = function() - gruvbox = false - sonokai = true - sonokai_style = "shusia" - end, - ["sonokai_maia"] = function() - gruvbox = false - sonokai = true - sonokai_style = "maia" - end, - ["sonokai_espresso"] = function() - gruvbox = false - sonokai = true - sonokai_style = "espresso" - end, - ["material"] = function() - gruvbox = false - material = true - end, - ["material_deepocean"] = function() - gruvbox = false - material = true - material_style = "deep ocean" - end, - ["material_palenight"] = function() - gruvbox = false - material = true - material_style = "palenight" - end, - ["material_lighter"] = function() - gruvbox = false - material = true - material_style = "lighter" - end, - ["material_darker"] = function() - gruvbox = false - material = true - material_style = "darker" - end, - ["onedark"] = function() - gruvbox = false - onedark = true - end, - ["onedark_darker"] = function() - gruvbox = false - onedark = true - onedark_style = "darker" - end, - ["onedark_cool"] = function() - gruvbox = false - onedark = true - onedark_style = "cool" - end, - ["onedark_deep"] = function() - gruvbox = false - onedark = true - onedark_style = "deep" - end, - ["onedark_warm"] = function() - gruvbox = false - onedark = true - onedark_style = "warm" - end, - ["onedark_warmer"] = function() - gruvbox = false - onedark = true - onedark_style = "warmer" - end, - ["onedark_light"] = function() - gruvbox = false - onedark = true - onedark_style = "light" - end, - ["lunar"] = function() - gruvbox = false - lunar = true - end, - ["nord"] = function() - gruvbox = false - nord = true - end, - ["catppuccin"] = function() - gruvbox = false - catppuccin = true - end, - ["catppuccin-latte"] = function() - gruvbox = false - catppuccin = true - end, - ["catppuccin-frappe"] = function() - gruvbox = false - catppuccin = true - end, - ["catppuccin-macchiato"] = function() - gruvbox = false - catppuccin = true - end, - ["catppuccin-mocha"] = function() - gruvbox = false - catppuccin = true - end, - ["dracula"] = function() - gruvbox = false - dracula = true - end, - ["nightfox"] = function() - gruvbox = false - nightfox = true - end, - ["dayfox"] = function() - gruvbox = false - nightfox = true - end, - ["dawnfox"] = function() - gruvbox = false - nightfox = true - end, - ["duskfox"] = function() - gruvbox = false - nightfox = true - end, - ["nordfox"] = function() - gruvbox = false - nightfox = true - end, - ["terafox"] = function() - gruvbox = false - nightfox = true - end, - ["carbonfox"] = function() - gruvbox = false - nightfox = true - end, - ["gruvbox-baby"] = function() - gruvbox = true - end, - default = function() - gruvbox = true - end, - }) - end -end +local color = vim.g.pcode_colorscheme +switch(color, { + ["tokyonight"] = function() + gruvbox = false + tokyonight = true + end, + ["tokyonight-night"] = function() + gruvbox = false + tokyonight = true + end, + ["tokyonight-storm"] = function() + gruvbox = false + tokyonight = true + end, + ["tokyonight-day"] = function() + gruvbox = false + tokyonight = true + end, + ["tokyonight-moon"] = function() + gruvbox = false + tokyonight = true + end, + ["sonokai"] = function() + gruvbox = false + sonokai = true + sonokai_style = "default" + end, + ["sonokai_atlantis"] = function() + gruvbox = false + sonokai = true + sonokai_style = "atlantis" + end, + ["sonokai_andromeda"] = function() + gruvbox = false + sonokai = true + sonokai_style = "andromeda" + end, + ["sonokai_shusia"] = function() + gruvbox = false + sonokai = true + sonokai_style = "shusia" + end, + ["sonokai_maia"] = function() + gruvbox = false + sonokai = true + sonokai_style = "maia" + end, + ["sonokai_espresso"] = function() + gruvbox = false + sonokai = true + sonokai_style = "espresso" + end, + ["material"] = function() + gruvbox = false + material = true + end, + ["material_deepocean"] = function() + gruvbox = false + material = true + material_style = "deep ocean" + end, + ["material_palenight"] = function() + gruvbox = false + material = true + material_style = "palenight" + end, + ["material_lighter"] = function() + gruvbox = false + material = true + material_style = "lighter" + end, + ["material_darker"] = function() + gruvbox = false + material = true + material_style = "darker" + end, + ["onedark"] = function() + gruvbox = false + onedark = true + end, + ["onedark_darker"] = function() + gruvbox = false + onedark = true + onedark_style = "darker" + end, + ["onedark_cool"] = function() + gruvbox = false + onedark = true + onedark_style = "cool" + end, + ["onedark_deep"] = function() + gruvbox = false + onedark = true + onedark_style = "deep" + end, + ["onedark_warm"] = function() + gruvbox = false + onedark = true + onedark_style = "warm" + end, + ["onedark_warmer"] = function() + gruvbox = false + onedark = true + onedark_style = "warmer" + end, + ["onedark_light"] = function() + gruvbox = false + onedark = true + onedark_style = "light" + end, + ["lunar"] = function() + gruvbox = false + lunar = true + end, + ["nord"] = function() + gruvbox = false + nord = true + end, + ["catppuccin"] = function() + gruvbox = false + catppuccin = true + end, + ["catppuccin-latte"] = function() + gruvbox = false + catppuccin = true + end, + ["catppuccin-frappe"] = function() + gruvbox = false + catppuccin = true + end, + ["catppuccin-macchiato"] = function() + gruvbox = false + catppuccin = true + end, + ["catppuccin-mocha"] = function() + gruvbox = false + catppuccin = true + end, + ["dracula"] = function() + gruvbox = false + dracula = true + end, + ["nightfox"] = function() + gruvbox = false + nightfox = true + end, + ["dayfox"] = function() + gruvbox = false + nightfox = true + end, + ["dawnfox"] = function() + gruvbox = false + nightfox = true + end, + ["duskfox"] = function() + gruvbox = false + nightfox = true + end, + ["nordfox"] = function() + gruvbox = false + nightfox = true + end, + ["terafox"] = function() + gruvbox = false + nightfox = true + end, + ["carbonfox"] = function() + gruvbox = false + nightfox = true + end, + ["gruvbox-baby"] = function() + gruvbox = true + end, + default = function() + gruvbox = true + end, +}) local transparent = false -local transparent_mode = config.transparent_mode +local transparent_mode = vim.g.pcode_transparent_mode if transparent_mode ~= nil then if transparent_mode == 1 then transparent = true diff --git a/lua/plugins/default.lua b/lua/plugins/default.lua index 7f688ae..6b7c1d6 100644 --- a/lua/plugins/default.lua +++ b/lua/plugins/default.lua @@ -14,4 +14,5 @@ local onsave, _ = pcall(require, "user.format_onsave") if onsave then require("user.format_onsave") end +vim.g.pcode_icons = require("user.icons") return {} diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua index 8438d4c..0b7531a 100644 --- a/lua/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -1,4 +1,4 @@ -local icons = require("user.icons") +local icons = vim.g.pcode_icons return { "lewis6991/gitsigns.nvim", lazy = true, diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 1800f0c..72b64fd 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,68 +1,68 @@ return { -- plugin ini merupakan penyedia library neovim lua - { - "nvim-lua/plenary.nvim", - lazy = true, - }, + -- { + -- "nvim-lua/plenary.nvim", + -- lazy = true, + -- }, -- coloring code - { - "nvim-treesitter/nvim-treesitter", - lazy = true, - event = "BufRead", - cmd = { - "TSBufDisable", - "TSBufEnable", - "TSBufToggle", - "TSDisable", - "TSEnable", - "TSToggle", - "TSInstall", - "TSInstallInfo", - "TSInstallSync", - "TSModuleInfo", - "TSUninstall", - "TSUpdate", - "TSUpdateSync", - }, - build = function() - local status_ok, ts = pcall(require, "nvim-treesitter.install") - if not status_ok then - return - end - ts.update({ with_sync = true })() - end, - config = function() - local status_ok, _ = pcall(require, "nvim-treesitter") - if not status_ok then - return - end - require("user.treesitter") - end, - }, + -- { + -- "nvim-treesitter/nvim-treesitter", + -- lazy = true, + -- event = "BufRead", + -- cmd = { + -- "TSBufDisable", + -- "TSBufEnable", + -- "TSBufToggle", + -- "TSDisable", + -- "TSEnable", + -- "TSToggle", + -- "TSInstall", + -- "TSInstallInfo", + -- "TSInstallSync", + -- "TSModuleInfo", + -- "TSUninstall", + -- "TSUpdate", + -- "TSUpdateSync", + -- }, + -- build = function() + -- local status_ok, ts = pcall(require, "nvim-treesitter.install") + -- if not status_ok then + -- return + -- end + -- ts.update({ with_sync = true })() + -- end, + -- config = function() + -- local status_ok, _ = pcall(require, "nvim-treesitter") + -- if not status_ok then + -- return + -- end + -- require("user.treesitter") + -- end, + -- }, -- snippets - { - "rafamadriz/friendly-snippets", - event = "InsertEnter", - lazy = true, - config = function() - require("luasnip.loaders.from_vscode").lazy_load() - require("user.snippets") - require("user.snip") - end, - }, - { - "L3MON4D3/LuaSnip", - lazy = true, - opts = { - history = true, - delete_check_events = "TextChanged", - }, - -- stylua: ignore - keys = { - { "", function() require("luasnip").jump(1) end, mode = "s" }, - { "", function() require("luasnip").jump(-1) end, mode = { "i", "s" } }, - }, - }, + -- { + -- "rafamadriz/friendly-snippets", + -- event = "InsertEnter", + -- lazy = true, + -- config = function() + -- require("luasnip.loaders.from_vscode").lazy_load() + -- require("user.snippets") + -- require("user.snip") + -- end, + -- }, + -- { + -- "L3MON4D3/LuaSnip", + -- lazy = true, + -- opts = { + -- history = true, + -- delete_check_events = "TextChanged", + -- }, + -- -- stylua: ignore + -- keys = { + -- { "", function() require("luasnip").jump(1) end, mode = "s" }, + -- { "", function() require("luasnip").jump(-1) end, mode = { "i", "s" } }, + -- }, + -- }, -- { -- "neovim/nvim-lspconfig", -- lazy = true, @@ -84,64 +84,64 @@ return { -- end, -- }, -- for formater linter - { - "RRethy/vim-illuminate", - event = "BufRead", - lazy = true, - config = function() - local status_ok, illuminate = pcall(require, "illuminate") - if not status_ok then - return - end - illuminate.configure({ - options = { - providers = { - "lsp", - "treesitter", - "regex", - }, - -- delay: delay in milliseconds - delay = 120, - -- filetype_overrides: filetype specific overrides. - -- The keys are strings to represent the filetype while the values are tables that - -- supports the same keys passed to .configure except for filetypes_denylist and filetypes_allowlist - filetype_overrides = {}, - -- filetypes_denylist: filetypes to not illuminate, this overrides filetypes_allowlist - filetypes_denylist = { - "dirvish", - "fugitive", - "alpha", - "NvimTree", - "lazy", - "neogitstatus", - "Trouble", - "lir", - "Outline", - "spectre_panel", - "toggleterm", - "DressingSelect", - "TelescopePrompt", - }, - -- filetypes_allowlist: filetypes to illuminate, this is overridden by filetypes_denylist - filetypes_allowlist = {}, - -- modes_denylist: modes to not illuminate, this overrides modes_allowlist - modes_denylist = {}, - -- modes_allowlist: modes to illuminate, this is overridden by modes_denylist - modes_allowlist = {}, - -- providers_regex_syntax_denylist: syntax to not illuminate, this overrides providers_regex_syntax_allowlist - -- Only applies to the 'regex' provider - -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name') - providers_regex_syntax_denylist = {}, - -- providers_regex_syntax_allowlist: syntax to illuminate, this is overridden by providers_regex_syntax_denylist - -- Only applies to the 'regex' provider - -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name') - providers_regex_syntax_allowlist = {}, - -- under_cursor: whether or not to illuminate under the cursor - under_cursor = true, - }, - }) - end, - }, + -- { + -- "RRethy/vim-illuminate", + -- event = "BufRead", + -- lazy = true, + -- config = function() + -- local status_ok, illuminate = pcall(require, "illuminate") + -- if not status_ok then + -- return + -- end + -- illuminate.configure({ + -- options = { + -- providers = { + -- "lsp", + -- "treesitter", + -- "regex", + -- }, + -- -- delay: delay in milliseconds + -- delay = 120, + -- -- filetype_overrides: filetype specific overrides. + -- -- The keys are strings to represent the filetype while the values are tables that + -- -- supports the same keys passed to .configure except for filetypes_denylist and filetypes_allowlist + -- filetype_overrides = {}, + -- -- filetypes_denylist: filetypes to not illuminate, this overrides filetypes_allowlist + -- filetypes_denylist = { + -- "dirvish", + -- "fugitive", + -- "alpha", + -- "NvimTree", + -- "lazy", + -- "neogitstatus", + -- "Trouble", + -- "lir", + -- "Outline", + -- "spectre_panel", + -- "toggleterm", + -- "DressingSelect", + -- "TelescopePrompt", + -- }, + -- -- filetypes_allowlist: filetypes to illuminate, this is overridden by filetypes_denylist + -- filetypes_allowlist = {}, + -- -- modes_denylist: modes to not illuminate, this overrides modes_allowlist + -- modes_denylist = {}, + -- -- modes_allowlist: modes to illuminate, this is overridden by modes_denylist + -- modes_allowlist = {}, + -- -- providers_regex_syntax_denylist: syntax to not illuminate, this overrides providers_regex_syntax_allowlist + -- -- Only applies to the 'regex' provider + -- -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name') + -- providers_regex_syntax_denylist = {}, + -- -- providers_regex_syntax_allowlist: syntax to illuminate, this is overridden by providers_regex_syntax_denylist + -- -- Only applies to the 'regex' provider + -- -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name') + -- providers_regex_syntax_allowlist = {}, + -- -- under_cursor: whether or not to illuminate under the cursor + -- under_cursor = true, + -- }, + -- }) + -- end, + -- }, -- { -- "jayp0521/mason-null-ls.nvim", -- lazy = true, @@ -161,285 +161,285 @@ return { -- end, -- }, -- debuging - { - "rcarriga/nvim-dap-ui", - lazy = true, - event = "BufRead", - dependencies = "mfussenegger/nvim-dap", - enabled = vim.fn.has("win32") == 0, - config = function() - require("user.dapui") - end, - }, - { - "jay-babu/mason-nvim-dap.nvim", - lazy = true, - event = "BufRead", - dependencies = { "williamboman/mason.nvim", "mfussenegger/nvim-dap" }, - enabled = vim.fn.has("win32") == 0, - config = function() - require("user.mason_dap") - end, - }, + -- { + -- "rcarriga/nvim-dap-ui", + -- lazy = true, + -- event = "BufRead", + -- dependencies = "mfussenegger/nvim-dap", + -- enabled = vim.fn.has("win32") == 0, + -- config = function() + -- require("user.dapui") + -- end, + -- }, + -- { + -- "jay-babu/mason-nvim-dap.nvim", + -- lazy = true, + -- event = "BufRead", + -- dependencies = { "williamboman/mason.nvim", "mfussenegger/nvim-dap" }, + -- enabled = vim.fn.has("win32") == 0, + -- config = function() + -- require("user.mason_dap") + -- end, + -- }, -- auto pairs - { - "windwp/nvim-autopairs", - lazy = true, - -- commit = "4fc96c8f3df89b6d23e5092d31c866c53a346347", - dependencies = "hrsh7th/nvim-cmp", - event = "InsertEnter", - config = function() - require("user.autopairs") - end, - }, + -- { + -- "windwp/nvim-autopairs", + -- lazy = true, + -- -- commit = "4fc96c8f3df89b6d23e5092d31c866c53a346347", + -- dependencies = "hrsh7th/nvim-cmp", + -- event = "InsertEnter", + -- config = function() + -- require("user.autopairs") + -- end, + -- }, -- untuk comment - { - "JoosepAlviste/nvim-ts-context-commentstring", - lazy = true, - dependencies = "nvim-treesitter/nvim-treesitter", - config = function() - require("ts_context_commentstring").setup({ - enable_autocmd = false, - }) - end, - }, - { - "numToStr/Comment.nvim", - lazy = true, - config = function() - require("user.comment") - end, - }, - { - "lukas-reineke/indent-blankline.nvim", - version = "3.5.4", - event = { "BufRead", "InsertEnter", "BufNewFile" }, - lazy = true, - opts = { - indent = { - char = "│", - tab_char = "│", - }, - scope = { enabled = false }, - exclude = { - buftypes = { - "nofile", - "prompt", - "quickfix", - "terminal", - }, - filetypes = { - "help", - "alpha", - "dashboard", - "neo-tree", - "Trouble", - "trouble", - "lazy", - "mason", - "notify", - "toggleterm", - "lazyterm", - "NvimTree", - "aerial", - "neogitstatus", - "startify", - }, - }, - }, - main = "ibl", - }, + -- { + -- "JoosepAlviste/nvim-ts-context-commentstring", + -- lazy = true, + -- dependencies = "nvim-treesitter/nvim-treesitter", + -- config = function() + -- require("ts_context_commentstring").setup({ + -- enable_autocmd = false, + -- }) + -- end, + -- }, + -- { + -- "numToStr/Comment.nvim", + -- lazy = true, + -- config = function() + -- require("user.comment") + -- end, + -- }, + -- { + -- "lukas-reineke/indent-blankline.nvim", + -- version = "3.5.4", + -- event = { "BufRead", "InsertEnter", "BufNewFile" }, + -- lazy = true, + -- opts = { + -- indent = { + -- char = "│", + -- tab_char = "│", + -- }, + -- scope = { enabled = false }, + -- exclude = { + -- buftypes = { + -- "nofile", + -- "prompt", + -- "quickfix", + -- "terminal", + -- }, + -- filetypes = { + -- "help", + -- "alpha", + -- "dashboard", + -- "neo-tree", + -- "Trouble", + -- "trouble", + -- "lazy", + -- "mason", + -- "notify", + -- "toggleterm", + -- "lazyterm", + -- "NvimTree", + -- "aerial", + -- "neogitstatus", + -- "startify", + -- }, + -- }, + -- }, + -- main = "ibl", + -- }, -- for multi cursor select - { - "mg979/vim-visual-multi", - event = { "BufRead", "InsertEnter", "BufNewFile" }, - lazy = true, - init = function() - vim.g.VM_mouse_mappings = 1 -- equal CTRL + Left Click on VSCODE - vim.g.VM_maps = { - ["Find Under"] = "", -- equal CTRL+D on VSCODE - ["Find Subword Under"] = "", -- equal CTRL+D on VSCODE - ["Select Cursor Down"] = "", -- equal CTRL+ALT+DOWN on VSCODE - ["Select Cursor Up"] = "", -- equal CTRL+ALT+UP on VSCODE - } - end, - }, + -- { + -- "mg979/vim-visual-multi", + -- event = { "BufRead", "InsertEnter", "BufNewFile" }, + -- lazy = true, + -- init = function() + -- vim.g.VM_mouse_mappings = 1 -- equal CTRL + Left Click on VSCODE + -- vim.g.VM_maps = { + -- ["Find Under"] = "", -- equal CTRL+D on VSCODE + -- ["Find Subword Under"] = "", -- equal CTRL+D on VSCODE + -- ["Select Cursor Down"] = "", -- equal CTRL+ALT+DOWN on VSCODE + -- ["Select Cursor Up"] = "", -- equal CTRL+ALT+UP on VSCODE + -- } + -- end, + -- }, -- for auto close tag - { - "windwp/nvim-ts-autotag", - lazy = true, - event = "BufRead", - dependencies = "nvim-treesitter/nvim-treesitter", - config = function() - require("nvim-ts-autotag").setup() - end, - }, + -- { + -- "windwp/nvim-ts-autotag", + -- lazy = true, + -- event = "BufRead", + -- dependencies = "nvim-treesitter/nvim-treesitter", + -- config = function() + -- require("nvim-ts-autotag").setup() + -- end, + -- }, -- for auto detection file and run code - { - "CRAG666/code_runner.nvim", - lazy = true, - cmd = { "RunCode", "RunFile", "RunProject", "RunClose" }, - config = function() - require("user.coderunner") - end, - }, + -- { + -- "CRAG666/code_runner.nvim", + -- lazy = true, + -- cmd = { "RunCode", "RunFile", "RunProject", "RunClose" }, + -- config = function() + -- require("user.coderunner") + -- end, + -- }, -- for color view - { - "NvChad/nvim-colorizer.lua", - lazy = true, - event = { "BufRead", "InsertEnter", "BufNewFile" }, - opts = { - user_default_options = { - RGB = true, -- #RGB hex codes - RRGGBB = true, -- #RRGGBB hex codes - names = true, -- "Name" codes like Blue - RRGGBBAA = true, -- #RRGGBBAA hex codes - rgb_fn = true, -- CSS rgb() and rgba() functions - hsl_fn = true, -- CSS hsl() and hsla() functions - css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB - css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn - -- Available modes: foreground, background - mode = "background", -- Set the display mode. - tailwind = true, - }, - filetypes = { - "*", -- Highlight all files, but customize some others. - css = { rgb_fn = true }, -- Enable parsing rgb(...) functions in css. - html = { names = false }, -- Disable parsing "names" like Blue or Gray - }, - }, - }, + -- { + -- "NvChad/nvim-colorizer.lua", + -- lazy = true, + -- event = { "BufRead", "InsertEnter", "BufNewFile" }, + -- opts = { + -- user_default_options = { + -- RGB = true, -- #RGB hex codes + -- RRGGBB = true, -- #RRGGBB hex codes + -- names = true, -- "Name" codes like Blue + -- RRGGBBAA = true, -- #RRGGBBAA hex codes + -- rgb_fn = true, -- CSS rgb() and rgba() functions + -- hsl_fn = true, -- CSS hsl() and hsla() functions + -- css = true, -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB + -- css_fn = true, -- Enable all CSS *functions*: rgb_fn, hsl_fn + -- -- Available modes: foreground, background + -- mode = "background", -- Set the display mode. + -- tailwind = true, + -- }, + -- filetypes = { + -- "*", -- Highlight all files, but customize some others. + -- css = { rgb_fn = true }, -- Enable parsing rgb(...) functions in css. + -- html = { names = false }, -- Disable parsing "names" like Blue or Gray + -- }, + -- }, + -- }, -- for winbar icon - { - "SmiteshP/nvim-navic", - lazy = true, - dependencies = "neovim/nvim-lspconfig", - event = "InsertEnter", - config = function() - require("user.breadcrumb") - require("user.winbar") - end, - }, + -- { + -- "SmiteshP/nvim-navic", + -- lazy = true, + -- dependencies = "neovim/nvim-lspconfig", + -- event = "InsertEnter", + -- config = function() + -- require("user.breadcrumb") + -- require("user.winbar") + -- end, + -- }, -- for popup alert - { - "rcarriga/nvim-notify", - lazy = true, - -- event = "BufWinEnter", - event = "VeryLazy", - keys = { - { - "un", - function() - require("notify").dismiss({ silent = true, pending = true }) - end, - desc = "Delete all Notifications", - }, - }, - opts = { - timeout = 3000, - max_height = function() - return math.floor(vim.o.lines * 0.75) - end, - max_width = function() - return math.floor(vim.o.columns * 0.75) - end, - }, - -- event = "BufWinEnter", - config = function() - local notify = require("notify") - -- this for transparency - notify.setup({ background_colour = "#000000" }) - -- this overwrites the vim notify function - vim.notify = notify.notify - end, - }, + -- { + -- "rcarriga/nvim-notify", + -- lazy = true, + -- -- event = "BufWinEnter", + -- event = "VeryLazy", + -- keys = { + -- { + -- "un", + -- function() + -- require("notify").dismiss({ silent = true, pending = true }) + -- end, + -- desc = "Delete all Notifications", + -- }, + -- }, + -- opts = { + -- timeout = 3000, + -- max_height = function() + -- return math.floor(vim.o.lines * 0.75) + -- end, + -- max_width = function() + -- return math.floor(vim.o.columns * 0.75) + -- end, + -- }, + -- -- event = "BufWinEnter", + -- config = function() + -- local notify = require("notify") + -- -- this for transparency + -- notify.setup({ background_colour = "#000000" }) + -- -- this overwrites the vim notify function + -- vim.notify = notify.notify + -- end, + -- }, -- for resize screen - { - "mrjones2014/smart-splits.nvim", - lazy = true, - event = { "BufRead", "InsertEnter", "BufNewFile" }, - config = function() - require("user.smartspit") - end, - }, + -- { + -- "mrjones2014/smart-splits.nvim", + -- lazy = true, + -- event = { "BufRead", "InsertEnter", "BufNewFile" }, + -- config = function() + -- require("user.smartspit") + -- end, + -- }, -- for popup input - { - "stevearc/dressing.nvim", - lazy = true, - init = function() - ---@diagnostic disable-next-line: duplicate-set-field - vim.ui.select = function(...) - require("lazy").load({ plugins = { "dressing.nvim" } }) - return vim.ui.select(...) - end - ---@diagnostic disable-next-line: duplicate-set-field - vim.ui.input = function(...) - require("lazy").load({ plugins = { "dressing.nvim" } }) - return vim.ui.input(...) - end - end, - config = function() - require("user.dressing") - end, - }, -- mini scrollview - { - "dstein64/nvim-scrollview", - lazy = true, - -- event = "BufWinEnter", - event = { "BufRead", "InsertEnter", "BufNewFile" }, - config = function() - require("user.nvimscroll") - end, - }, + -- { + -- "stevearc/dressing.nvim", + -- lazy = true, + -- init = function() + -- ---@diagnostic disable-next-line: duplicate-set-field + -- vim.ui.select = function(...) + -- require("lazy").load({ plugins = { "dressing.nvim" } }) + -- return vim.ui.select(...) + -- end + -- ---@diagnostic disable-next-line: duplicate-set-field + -- vim.ui.input = function(...) + -- require("lazy").load({ plugins = { "dressing.nvim" } }) + -- return vim.ui.input(...) + -- end + -- end, + -- config = function() + -- require("user.dressing") + -- end, + -- }, -- mini scrollview + -- { + -- "dstein64/nvim-scrollview", + -- lazy = true, + -- -- event = "BufWinEnter", + -- event = { "BufRead", "InsertEnter", "BufNewFile" }, + -- config = function() + -- require("user.nvimscroll") + -- end, + -- }, -- for check startuptime - { "dstein64/vim-startuptime", lazy = true, cmd = "StartupTime" }, + -- { "dstein64/vim-startuptime", lazy = true, cmd = "StartupTime" }, -- { -- "pojokcodeid/nvim-ts-rainbow2", -- lazy = true, -- event = "BufRead", -- dependencies = "nvim-treesitter/nvim-treesitter", -- }, - { - "hiphish/rainbow-delimiters.nvim", - lazy = true, - event = "BufRead", - config = function() - -- Modul ini berisi beberapa definisi default - local rainbow_delimiters = require("rainbow-delimiters") - vim.g.rainbow_delimiters = { - strategy = { - [""] = rainbow_delimiters.strategy["global"], - vim = rainbow_delimiters.strategy["local"], - }, - query = { - [""] = "rainbow-delimiters", - lua = "rainbow-blocks", - }, - priority = { - [""] = 110, - lua = 210, - }, - highlight = { - "RainbowDelimiterRed", - "RainbowDelimiterYellow", - "RainbowDelimiterBlue", - "RainbowDelimiterOrange", - "RainbowDelimiterGreen", - "RainbowDelimiterViolet", - "RainbowDelimiterCyan", - }, - } - end, - }, - { - "lewis6991/gitsigns.nvim", - lazy = true, - enabled = vim.fn.executable("git") == 1, - ft = "gitcommit", - -- event = "BufWinEnter", - event = "BufRead", - config = function() - require("user.gitsigns") - end, - }, + -- { + -- "hiphish/rainbow-delimiters.nvim", + -- lazy = true, + -- event = "BufRead", + -- config = function() + -- -- Modul ini berisi beberapa definisi default + -- local rainbow_delimiters = require("rainbow-delimiters") + -- vim.g.rainbow_delimiters = { + -- strategy = { + -- [""] = rainbow_delimiters.strategy["global"], + -- vim = rainbow_delimiters.strategy["local"], + -- }, + -- query = { + -- [""] = "rainbow-delimiters", + -- lua = "rainbow-blocks", + -- }, + -- priority = { + -- [""] = 110, + -- lua = 210, + -- }, + -- highlight = { + -- "RainbowDelimiterRed", + -- "RainbowDelimiterYellow", + -- "RainbowDelimiterBlue", + -- "RainbowDelimiterOrange", + -- "RainbowDelimiterGreen", + -- "RainbowDelimiterViolet", + -- "RainbowDelimiterCyan", + -- }, + -- } + -- end, + -- }, + -- { + -- "lewis6991/gitsigns.nvim", + -- lazy = true, + -- enabled = vim.fn.executable("git") == 1, + -- ft = "gitcommit", + -- -- event = "BufWinEnter", + -- event = "BufRead", + -- config = function() + -- require("user.gitsigns") + -- end, + -- }, } diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 0016957..e571156 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -21,39 +21,34 @@ return { -- check config for theme local set_theme = "auto" local bubbles_theme - local data_exists, config = pcall(require, "core.config") - if data_exists then - if config.colorscheme ~= nil then - local color = config.colorscheme - switch(color, { - ["tokyonight"] = function() - set_theme = "auto" - end, - ["tokyonight-night"] = function() - set_theme = "auto" - end, - ["tokyonight-storm"] = function() - set_theme = "auto" - end, - ["tokyonight-day"] = function() - set_theme = "auto" - end, - ["tokyonight-moon"] = function() - set_theme = "auto" - end, - ["dracula"] = function() - local clr = require("dracula").colors() - colors.blue = clr.green - colors.black = clr.black - colors.cyan = clr.yellow - set_theme = "bubbles_theme" - end, - default = function() - set_theme = "auto" - end, - }) - end - end + local color = vim.g.pcode_colorscheme + switch(color, { + ["tokyonight"] = function() + set_theme = "auto" + end, + ["tokyonight-night"] = function() + set_theme = "auto" + end, + ["tokyonight-storm"] = function() + set_theme = "auto" + end, + ["tokyonight-day"] = function() + set_theme = "auto" + end, + ["tokyonight-moon"] = function() + set_theme = "auto" + end, + ["dracula"] = function() + local clr = require("dracula").colors() + colors.blue = clr.green + colors.black = clr.black + colors.cyan = clr.yellow + set_theme = "bubbles_theme" + end, + default = function() + set_theme = "auto" + end, + }) bubbles_theme = component.bubbles_theme(colors) if set_theme == "auto" then diff --git a/lua/plugins/nvimtree.lua b/lua/plugins/nvimtree.lua index 162f879..8985e76 100644 --- a/lua/plugins/nvimtree.lua +++ b/lua/plugins/nvimtree.lua @@ -1,4 +1,4 @@ -local icons = require("user.icons") +local icons = vim.g.pcode_icons return { "kyazdani42/nvim-tree.lua", lazy = true, diff --git a/lua/plugins/whichkey.lua b/lua/plugins/whichkey.lua index 251720d..892db7d 100644 --- a/lua/plugins/whichkey.lua +++ b/lua/plugins/whichkey.lua @@ -4,7 +4,7 @@ return { keys = { "", '"', "'", "`", "c", "v" }, event = "VeryLazy", opts = function() - local icons = require("user.icons") + local icons = vim.g.pcode_icons return { plugins = { marks = false, -- shows a list of your marks on ' and ` @@ -95,12 +95,7 @@ return { nowait = true, -- use `nowait` when creating keymaps } - local wkey = {} - local data_exists, key = pcall(require, "core.config") - if data_exists then - wkey = key.whichkey - end - + local wkey = vim.g.pcode_whichkey local which_key = require("which-key") which_key.setup(opts) which_key.register(require("user.utils.whichkey").mappings, opt) diff --git a/lua/user/alpha.lua b/lua/user/alpha.lua index 12e8526..c98b17a 100644 --- a/lua/user/alpha.lua +++ b/lua/user/alpha.lua @@ -1,14 +1,9 @@ -local data_exists, custom_dasboard = pcall(require, "core.config") -if data_exists then - local model = custom_dasboard.model - if model ~= nil then - if model == 1 then - require("user.startify") - else - require("user.dashboard") - end - else +local model = vim.g.pcode_model +if model ~= nil then + if model == 1 then require("user.startify") + else + require("user.dashboard") end else require("user.startify") diff --git a/lua/user/breadcrumb.lua b/lua/user/breadcrumb.lua index 2594a81..1671070 100644 --- a/lua/user/breadcrumb.lua +++ b/lua/user/breadcrumb.lua @@ -3,7 +3,7 @@ if not status_ok then return end -local ico = require("user.icons") +local ico = vim.g.pcode_icons local icons = ico.kind navic.setup({ diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua index 3f09ce2..23e61d0 100644 --- a/lua/user/colorscheme.lua +++ b/lua/user/colorscheme.lua @@ -1,22 +1,33 @@ -local colorscheme = "gruvbox-baby" -local lst_style = - { "sonokai", "sonokai_atlantis", "sonokai_andromeda", "sonokai_shusia", "sonokai_maia", "sonokai_espresso" } -local lst_material = { "material", "material_deepocean", "material_palenight", "material_lighter", "material_darker" } -local lst_onedark = - { "onedark", "onedark_darker", "onedark_cool", "onedark_deep,onedark_warm", "onedark_warmer", "onedark_light" } -local data_exists, config = pcall(require, "core.config") -if data_exists then - if config.colorscheme ~= nil then - colorscheme = config.colorscheme - else - colorscheme = "gruvbox-baby" - end - local transparent_mode = config.transparent_mode - if transparent_mode ~= nil then - if transparent_mode == 1 then - vim.g.gruvbox_baby_transparent_mode = 1 - vim.g.sonokai_transparent_background = 2 - end +local colorscheme = vim.g.pcode_colorscheme +local lst_style = { + "sonokai", + "sonokai_atlantis", + "sonokai_andromeda", + "sonokai_shusia", + "sonokai_maia", + "sonokai_espresso", +} +local lst_material = { + "material", + "material_deepocean", + "material_palenight", + "material_lighter", + "material_darker", +} +local lst_onedark = { + "onedark", + "onedark_darker", + "onedark_cool", + "onedark_deep,onedark_warm", + "onedark_warmer", + "onedark_light", +} + +local transparent_mode = vim.g.pcode_transparent_mode +if transparent_mode ~= nil then + if transparent_mode == 1 then + vim.g.gruvbox_baby_transparent_mode = 1 + vim.g.sonokai_transparent_background = 2 end end @@ -38,10 +49,5 @@ for _, v in pairs(lst_onedark) do break end end -local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) -if not status_ok then - local ok, _ = pcall(vim.cmd, "colorscheme " .. "gruvbox-baby") - if not ok then - return - end -end + +vim.cmd("colorscheme " .. colorscheme) diff --git a/lua/user/dashboard.lua b/lua/user/dashboard.lua index 14bd33b..9032fb6 100644 --- a/lua/user/dashboard.lua +++ b/lua/user/dashboard.lua @@ -14,12 +14,9 @@ local board = { [[|_| |__/ ]], } -local data_exists, custom_dasboard = pcall(require, "core.config") -if data_exists then - local data_board = custom_dasboard.header2 - if data_board ~= nil then - board = data_board - end +local data_board = vim.g.pcode_header2 +if data_board ~= nil then + board = data_board end local dashboard = require("alpha.themes.dashboard") @@ -44,11 +41,9 @@ dashboard.opts.opts.noautocmd = true alpha.setup(dashboard.opts) local footer_text = "Pojok Code" -if data_exists then - local data_txt = custom_dasboard.footer - if data_txt ~= nil then - footer_text = data_txt - end +local data_txt = vim.g.pcode_footer +if data_txt ~= nil then + footer_text = data_txt end vim.api.nvim_create_autocmd("User", { diff --git a/lua/user/format_onsave.lua b/lua/user/format_onsave.lua index f56c6e6..edb61cb 100644 --- a/lua/user/format_onsave.lua +++ b/lua/user/format_onsave.lua @@ -1,13 +1,12 @@ local run = 0 -local data_exists, frmt = pcall(require, "core.config") -if not data_exists then - run = 1 -end -if frmt.format_on_save == 1 then +local frmt = vim.g.pcode_format_on_save +if frmt == 1 then run = 1 +else + run = 0 end -local buf_clients = vim.lsp.buf_get_clients() +local buf_clients = vim.lsp.get_clients() if next(buf_clients) == nil then run = 0 end diff --git a/lua/user/lsp/config.lua b/lua/user/lsp/config.lua index 6803f52..3b85505 100644 --- a/lua/user/lsp/config.lua +++ b/lua/user/lsp/config.lua @@ -9,11 +9,8 @@ local lspconfig = require("lspconfig") -- local servers = { "jdtls", "yamlls" } local servers = {} -local data_exists, custom_lsp = pcall(require, "core.config") -if data_exists then - for _, client in pairs(custom_lsp.lsp_installer) do - table.insert(servers, client) - end +for _, client in pairs(vim.g.pcode_lsp_installer) do + table.insert(servers, client) end lsp_installer.setup({ diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua index ebd37f4..acd5a25 100644 --- a/lua/user/lsp/handlers.lua +++ b/lua/user/lsp/handlers.lua @@ -5,13 +5,8 @@ if not status_cmp_ok then return end -local lspvitualtext = false -local data_exists, lspconfig = pcall(require, "core.config") -if data_exists then - lspvitualtext = lspconfig.lsp_virtualtext -end - -local icons = require("user.icons") +local lspvitualtext = vim.g.pcode_lsp_virtualtext +local icons = vim.g.pcode_icons M.capabilities = vim.lsp.protocol.make_client_capabilities() M.capabilities.textDocument.completion.completionItem.snippetSupport = true diff --git a/lua/user/lsp/mason.lua b/lua/user/lsp/mason.lua index 9ee4f87..98dc90b 100644 --- a/lua/user/lsp/mason.lua +++ b/lua/user/lsp/mason.lua @@ -11,31 +11,18 @@ local function idxOf(array, value) return nil end -local data_exists, custom_lsp = pcall(require, "core.config") -if data_exists then - for _, client in pairs(custom_lsp.mason_ensure_installed) do - table.insert(servers, client) - end +for _, client in pairs(vim.g.pcode_mason_ensure_installed) do + table.insert(servers, client) end -local unregis_lsp = {} -local data_ok, unregis = pcall(require, "core.config") -if data_ok then - if unregis.unregister_lsp ~= nil then - unregis_lsp = unregis.unregister_lsp - end -end - -local icons = require("user.icons").ui +local unregis_lsp = vim.g.pcode_unregister_lsp +local icons = vim.g.pcode_icons.ui local settings = { ui = { -- border = "none", border = icons.Border, icons = { - -- package_installed = "◍", - -- package_pending = "◍", - -- package_uninstalled = "◍", package_pending = icons.DotCircle, package_installed = icons.CheckCircle, package_uninstalled = icons.BlankCircle, diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua index 5317aa0..5af9922 100644 --- a/lua/user/lsp/null-ls.lua +++ b/lua/user/lsp/null-ls.lua @@ -20,12 +20,9 @@ if data_ok then end end -local data_exists, data = pcall(require, "core.config") -if data_exists then - -- load data null-ls - for _, nullls in pairs(data.null_ls_ensure_installed) do - table.insert(ensure_installed, nullls) - end +-- load data null-ls +for _, nullls in pairs(vim.g.pcode_null_ls_ensure_installed) do + table.insert(ensure_installed, nullls) end local mason_ok, mason_null_ls = pcall(require, "mason-null-ls") @@ -36,11 +33,8 @@ if mason_ok then end local run = 0 -local ok, frmt = pcall(require, "core.config") -if not ok then - run = 1 -end -if frmt.format_on_save == 1 then +local frmt = vim.g.pcode_format_on_save +if frmt == 1 then run = 1 end diff --git a/lua/user/onedark.lua b/lua/user/onedark.lua deleted file mode 100644 index 2037608..0000000 --- a/lua/user/onedark.lua +++ /dev/null @@ -1,39 +0,0 @@ -require("onedark").setup({ - -- Main options -- - style = "darker", -- Default theme style. Choose between 'dark', 'darker', 'cool', 'deep', 'warm', 'warmer' and 'light' - transparent = true, -- Show/hide background - term_colors = true, -- Change terminal color as per the selected theme style - ending_tildes = false, -- Show the end-of-buffer tildes. By default they are hidden - cmp_itemkind_reverse = false, -- reverse item kind highlights in cmp menu - - -- toggle theme style --- - toggle_style_key = nil, -- keybind to toggle theme style. Leave it nil to disable it, or set it to a string, for example "ts" - toggle_style_list = { "dark", "darker", "cool", "deep", "warm", "warmer", "light" }, -- List of styles to toggle between - - -- Change code style --- - -- Options are italic, bold, underline, none - -- You can configure multiple style with comma seperated, For e.g., keywords = 'italic,bold' - code_style = { - comments = "italic", - keywords = "none", - functions = "none", - strings = "none", - variables = "none", - }, - - -- Lualine options -- - lualine = { - transparent = false, -- lualine center bar transparency - }, - - -- Custom Highlights -- - colors = {}, -- Override default colors - highlights = {}, -- Override highlight groups - - -- Plugins Config -- - diagnostics = { - darker = true, -- darker colors for diagnostic - undercurl = true, -- use undercurl instead of underline for diagnostics - background = true, -- use background color for virtual text - }, -}) diff --git a/lua/user/startify.lua b/lua/user/startify.lua index 551f365..5f722ca 100644 --- a/lua/user/startify.lua +++ b/lua/user/startify.lua @@ -9,13 +9,11 @@ dash_model = { [[ /_/ |___/ ]], } -local data_exists, custom_dasboard = pcall(require, "core.config") -if data_exists then - local board = custom_dasboard.header1 - if board ~= nil then - dash_model = board - end +local board = vim.g.pcode_header1 +if board ~= nil then + dash_model = board end + startify.section.header.val = dash_model startify.section.top_buttons.val = { startify.button("F", "󰈞 Find file", ":Telescope find_files "), @@ -41,11 +39,9 @@ startify.section.bottom_buttons.val = { } local footer_text = "Pojok Code" -if data_exists then - local data_txt = custom_dasboard.footer - if data_txt ~= nil then - footer_text = data_txt - end +local data_txt = vim.g.pcode_footer +if data_txt ~= nil then + footer_text = data_txt end vim.api.nvim_create_autocmd("User", { diff --git a/lua/user/tokyonight.lua b/lua/user/tokyonight.lua index cb4ac03..a405336 100644 --- a/lua/user/tokyonight.lua +++ b/lua/user/tokyonight.lua @@ -5,17 +5,15 @@ end local transp = false local sidebar = "normal" --"dark , transparent, normal" local hilight = "#292e42" -local data_exists, config = pcall(require, "core.config") -if data_exists then - local tras = config.transparent_mode - if tras == 1 then - transp = true - sidebar = "transparent" - -- hilight = "#3E4254" - -- hilight = "#353a56" - hilight = "#292e42" - end +local tras = vim.g.pcode_transparent_mode +if tras == 1 then + transp = true + sidebar = "transparent" + -- hilight = "#3E4254" + -- hilight = "#353a56" + hilight = "#292e42" end + tokyonight.setup({ -- your configuration comes here -- or leave it empty to use the default settings diff --git a/lua/user/treesitter.lua b/lua/user/treesitter.lua deleted file mode 100644 index 7a00e9f..0000000 --- a/lua/user/treesitter.lua +++ /dev/null @@ -1,48 +0,0 @@ -local status_ok, configs = pcall(require, "nvim-treesitter.configs") -if not status_ok then - return -end -configs.setup({ - ensure_installed = { - "lua", - "vim", - }, - ignore_install = { "phpdoc" }, -- List of parsers to ignore installing - highlight = { - enable = true, - disable = { "css" }, -- list of language that will be disabled - additional_vim_regex_highlighting = false, - }, - -- context_commentstring = { - -- enable = true, - -- enable_autocmd = false, - -- config = { - -- Languages that have a single comment style - -- typescript = "// %s", - -- css = "/* %s */", - -- scss = "/* %s */", - -- html = "", - -- svelte = "", - -- vue = "", - -- jsx = "{/* %s */}", - -- json = "", - -- }, - -- }, - -- rainbow = { - -- enable = true, - -- disable = { "html", "tsx" }, - -- equery = "rainbow-parens", - -- strategy = require("ts-rainbow").strategy.global, - -- }, - -- rainbow = { - -- enable = false, - -- extended_mode = true, -- Highlight also non-parentheses delimiters, boolean or table: lang -> boolean - -- max_file_lines = 1000, -- Do not enable for files with more than 1000 lines, int - -- }, - -- autotag = { enable = true, enable_rename = true, enable_close = true, enable_close_on_slash = true }, - incremental_selection = { enable = true }, - indent = { enable = true, disable = { "python", "css" } }, - autopairs = { - enable = true, - }, -}) diff --git a/lua/user/utils/lualine_component.lua b/lua/user/utils/lualine_component.lua index 4d88e85..52775ab 100644 --- a/lua/user/utils/lualine_component.lua +++ b/lua/user/utils/lualine_component.lua @@ -1,7 +1,7 @@ local hide_in_width = function() return vim.fn.winwidth(0) > 75 end -local icons = require("user.icons") +local icons = vim.g.pcode_icons local formatter = require("user.utils.formatter") local linter = require("user.utils.linter") diff --git a/lua/user/winbar.lua b/lua/user/winbar.lua index cdf9bd9..9cb60f0 100644 --- a/lua/user/winbar.lua +++ b/lua/user/winbar.lua @@ -1,5 +1,5 @@ local active = true -local icons = require("user.icons") +local icons = vim.g.pcode_icons local excludes = function() return vim.tbl_contains({ "help",