diff --git a/lazy-lock.json b/lazy-lock.json index ae10a22..e2e1797 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -9,15 +9,16 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "code_runner.nvim": { "branch": "main", "commit": "0c701cae3265c79b4fdfd4b35a4f3d7c5986d46c" }, - "codeium.vim": { "branch": "main", "commit": "5b8f68d5c0e32ae97d073a56ff14dba5646ec223" }, + "code_runner.nvim": { "branch": "main", "commit": "baea3a97c02276bff92b235f4e0d9fd8909d0d04" }, + "codeium.vim": { "branch": "main", "commit": "bef9cbaa5c19ab85d8048f364bfc0ac8c7ab335d" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, + "github-nvim-theme": { "branch": "main", "commit": "7e08e9cbf6da64b151f708a3e7e9f43447ae0171" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, "lsp-progress.nvim": { "branch": "main", "commit": "1c37b1cd0611563a767f0a340d61f265c4c54ecd" }, - "lualine.nvim": { "branch": "master", "commit": "3c55675a7bc170d21d7ea70874ae66fbf5cfb0dc" }, + "lualine.nvim": { "branch": "master", "commit": "26dac2fcadb6e622790ab08e36d0dba3d3765398" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, @@ -26,7 +27,7 @@ "neoscroll.nvim": { "branch": "master", "commit": "21d52973bde32db998fc8b6590f87eb3c3c6d8e4" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "none-ls-extras.nvim": { "branch": "main", "commit": "c226aca7a506dd4325fb96188bffe804d24bbf18" }, - "none-ls.nvim": { "branch": "main", "commit": "bc543fa6c9ca1b7cd39d1bb555a6276789b329a6" }, + "none-ls.nvim": { "branch": "main", "commit": "72e25ed4162474ef5d666525853f8a42bffd97c5" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, @@ -37,17 +38,17 @@ "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, - "nvim-tree.lua": { "branch": "master", "commit": "d35a8d5ec6358ada4b058431b367b32360737466" }, + "nvim-tree.lua": { "branch": "master", "commit": "707b24af91a1d05823099ed8c5450796290466ba" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, - "telescope.nvim": { "branch": "master", "commit": "b323abeb4baf9e4851c3af1961e770ce76c657c7" }, + "telescope.nvim": { "branch": "master", "commit": "67c598fdd4fca113224281c85721c4d8a6df055e" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, - "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index e308fbe..511d936 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -17,3 +17,4 @@ require("user.keymaps") -- require("user.chat_gpt") -- vim.cmd("colorscheme one_monokai") -- vim.cmd("colorscheme onedark") +vim.cmd("colorscheme github_dark_dimmed") diff --git a/lua/custom/default.lua b/lua/custom/default.lua index fe714cd..d8750a6 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -11,7 +11,7 @@ -- catppuccin, catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha -- dracula -- nightfox, dayfox, dawnfox, duskfox, nordfox, terafox, carbonfox -vim.g.pcode_colorscheme = "tokyonight" +vim.g.pcode_colorscheme = "onedark" -- custom transparent mode -- only support diff --git a/lua/custom/plugins/github.lua b/lua/custom/plugins/github.lua new file mode 100644 index 0000000..28ed52b --- /dev/null +++ b/lua/custom/plugins/github.lua @@ -0,0 +1,78 @@ +return { + "projekt0n/github-nvim-theme", + lazy = false, -- make sure we load this during startup if it is your main colorscheme + priority = 1000, -- make sure to load this before all the other start plugins + config = function() + local palette = require("github-theme.palette").load("github_dark_dimmed") + require("github-theme").setup({ + options = { + -- Compiled file's destination location + compile_path = vim.fn.stdpath("cache") .. "/github-theme", + compile_file_suffix = "_compiled", -- Compiled file suffix + hide_end_of_buffer = true, -- Hide the '~' character at the end of the buffer for a cleaner look + hide_nc_statusline = true, -- Override the underline style for non-active statuslines + transparent = false, -- Disable setting background + terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal` + dim_inactive = false, -- Non focused panes set to alternative background + module_default = true, -- Default enable value for modules + styles = { -- Style to be applied to different syntax groups + comments = "italic", -- Value is any valid attr-list value `:help attr-list` + functions = "italic", + keywords = "NONE", + variables = "NONE", + conditionals = "NONE", + constants = "NONE", + numbers = "NONE", + operators = "NONE", + strings = "NONE", + types = "NONE", + }, + inverse = { -- Inverse highlight for different types + match_paren = false, + visual = false, + search = false, + }, + darken = { -- Darken floating windows and sidebar-like windows + floats = false, + sidebars = { + enabled = true, + list = {}, -- Apply dark background to specific windows + }, + }, + modules = { -- List of various plugins and additional options + -- ... + }, + }, + palettes = { + all = { + bg0 = "bg1", + }, + }, + specs = {}, + groups = { + all = { + -- As with specs and palettes, a specific style's value will be used over the `all`'s value. + illuminatedWord = { bg = "#3b4261" }, + illuminatedCurWord = { bg = "#3b4261" }, + IlluminatedWordText = { bg = "#3b4261" }, + IlluminatedWordRead = { bg = "#3b4261" }, + IlluminatedWordWrite = { bg = "#3b4261" }, + NvimTreeNormal = { fg = "fg1", bg = "bg1" }, + NvimTreeSpecialFile = { fg = "fg1", style = "italic" }, + BufferLineFill = { bg = "bg1" }, + BufferLineUnfocusedFill = { bg = "bg1" }, + LualineNormal = { bg = "bg1" }, + StatusLine = { bg = "bg1" }, + StatusLineTerm = { bg = "bg1" }, + Pmenu = { bg = "bg1" }, + PmenuSel = { link = "CursorLine" }, + WhichKeyFloat = { bg = "bg1" }, + LazyNormal = { bg = "bg1" }, + LazyBackground = { bg = "bg1" }, + ["@tag.attribute"] = { fg = palette.field, style = "italic" }, + ["@text.uri"] = { fg = palette.const, style = "italic" }, + }, + }, + }) + end, +} diff --git a/lua/custom/plugins/githubdark.lua b/lua/custom/plugins/githubdark.lua new file mode 100644 index 0000000..c572395 --- /dev/null +++ b/lua/custom/plugins/githubdark.lua @@ -0,0 +1,69 @@ +return { + -- "projekt0n/github-nvim-theme", + -- lazy = false, -- make sure we load this during startup if it is your main colorscheme + -- priority = 1000, -- make sure to load this before all the other start plugins + -- config = function() + -- require("github-theme").setup({ + -- options = { + -- -- Compiled file's destination location + -- compile_path = vim.fn.stdpath("cache") .. "/github-theme", + -- compile_file_suffix = "_compiled", -- Compiled file suffix + -- hide_end_of_buffer = true, -- Hide the '~' character at the end of the buffer for a cleaner look + -- hide_nc_statusline = true, -- Override the underline style for non-active statuslines + -- transparent = false, -- Disable setting background + -- terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal` + -- dim_inactive = false, -- Non focused panes set to alternative background + -- module_default = true, -- Default enable value for modules + -- styles = { -- Style to be applied to different syntax groups + -- comments = "NONE", -- Value is any valid attr-list value `:help attr-list` + -- functions = "NONE", + -- keywords = "NONE", + -- variables = "NONE", + -- conditionals = "NONE", + -- constants = "NONE", + -- numbers = "NONE", + -- operators = "NONE", + -- strings = "NONE", + -- types = "NONE", + -- }, + -- inverse = { -- Inverse highlight for different types + -- match_paren = false, + -- visual = false, + -- search = false, + -- }, + -- darken = { -- Darken floating windows and sidebar-like windows + -- floats = false, + -- sidebars = { + -- enabled = true, + -- list = {}, -- Apply dark background to specific windows + -- }, + -- }, + -- modules = { -- List of various plugins and additional options + -- -- ... + -- }, + -- }, + -- palettes = {}, + -- specs = {}, + -- groups = { + -- -- As with specs and palettes, the values defined under `all` will be applied to every style. + -- all = { + -- -- If `link` is defined it will be applied over any other values defined + -- Whitespace = { link = "Comment" }, + -- + -- -- Specs are used for the template. Specs have their palette's as a field that can be accessed + -- IncSearch = { bg = "palette.cyan" }, + -- illuminatedWord = { bg = "#3b4261" }, + -- illuminatedCurWord = { bg = "#3b4261" }, + -- IlluminatedWordText = { bg = "#3b4261" }, + -- IlluminatedWordRead = { bg = "#3b4261" }, + -- IlluminatedWordWrite = { bg = "#3b4261" }, + -- -- NvimTreeNormal = { fg = "palette.fg1", bg = "palette.bg2" }, + -- }, + -- github_dark = { + -- -- As with specs and palettes, a specific style's value will be used over the `all`'s value. + -- PmenuSel = { bg = "#73daca", fg = "bg0" }, + -- }, + -- }, + -- }) + -- end, +} diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index aaa731f..b875c7a 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -105,12 +105,12 @@ return { -- remove border window from cmp completion = { border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, - winhighlight = "Normal:bg,FloatBorder:bg,CursorLine:PmenuSel,Search:None", + winhighlight = "Normal:bg,FloatBorder:BorderBG,CursorLine:PmenuSel,Search:None", scrollbar = true, }, documentation = { border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, - winhighlight = "Normal:bg,FloatBorder:bg,CursorLine:PmenuSel,Search:None", + winhighlight = "Normal:bg,FloatBorder:BorderBG,CursorLine:PmenuSel,Search:None", scrollbar = true, }, }, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index f70e96b..c2c78f1 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -366,6 +366,7 @@ return { variables = "none", }, highlights = { + -- BorderBG = { fg = "#333842" }, -- untuk custom brder color cmp -- overide indent line fill color NvimTreeNormal = { fg = "$fg", bg = "$bg0" }, NvimTreeIndentMarker = { fg = "#3E4450" }, diff --git a/lua/user/webdevicons.lua b/lua/user/webdevicons.lua index 357b965..eea0956 100644 --- a/lua/user/webdevicons.lua +++ b/lua/user/webdevicons.lua @@ -123,6 +123,18 @@ material_icon.setup({ cterm_color = "220", name = "rar", }, + ["cfm"] = { + icon = "", + color = "#507F89", + cterm_color = "220", + name = "cfm", + }, + ["cfc"] = { + icon = "", + color = "#507F89", + cterm_color = "220", + name = "cfc", + }, -- ["go"] = { -- icon = "󰟓", -- color = "#0FBFCF", @@ -317,5 +329,17 @@ web_devicons.setup({ cterm_color = "220", name = "gradlewFile", }, + ["dockerfile-development"] = { + icon = "", + color = "#0087c9", + cterm_color = "220", + name = "gradlewFile-development", + }, + ["dockerfile-staging"] = { + icon = "", + color = "#0087c9", + cterm_color = "220", + name = "gradlewFile-staging", + }, }, })