From 1cacea97f603b700b7d4ecfca1d7370ea3dd0ab5 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Sun, 21 Apr 2024 09:12:19 +0700 Subject: [PATCH 01/23] update --- lua/config/lazy.lua | 1 + lua/custom/plugins/onedarkpro.lua | 207 ++++++++++++++++-------------- lua/plugins/colorscheme.lua | 3 +- lua/plugins/init.lua | 26 +++- lua/user/icons.lua | 4 +- lua/user/nvim-tree.lua | 8 +- lua/user/webdevicons.lua | 12 ++ 7 files changed, 153 insertions(+), 108 deletions(-) diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index d776489..a0f8864 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -21,6 +21,7 @@ require("lazy").setup({ version = "*", -- try installing the latest stable version for plugins that support semver }, ui = { + backdrop = 100, border = "rounded", browser = "chrome", throttle = 40, diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 73eb3fe..844ab1a 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -1,101 +1,110 @@ return { - -- { "navarasu/onedark.nvim", enabled = false }, - -- { - -- "olimorris/onedarkpro.nvim", - -- priority = 1000, -- Ensure it loads first - -- config = function() - -- require("onedarkpro").setup({ - -- styles = { - -- types = "NONE", - -- methods = "NONE", - -- numbers = "NONE", - -- strings = "NONE", - -- comments = "italic", - -- keywords = "bold,italic", - -- constants = "NONE", - -- functions = "italic", - -- operators = "NONE", - -- variables = "NONE", - -- parameters = "NONE", - -- conditionals = "italic", - -- virtual_text = "NONE", - -- tags = "italic", - -- }, - -- colors = { - -- onedark = { - -- green = "#99c379", - -- gray = "#8094b4", - -- red = "#e06c75", - -- purple = "#c678dd", - -- yellow = "#e5c07a", - -- blue = "#61afef", - -- cyan = "#56b6c2", - -- bg_statusline = "#282c34", - -- indentline = "#3b4261", - -- float_bg = "#282c34", - -- }, - -- }, - -- options = { - -- cursorline = true, - -- transparency = false, - -- terminal_colors = true, - -- }, - -- highlights = { - -- -- overide cursor line fill colors - -- LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. - -- CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. - -- CursorLine = { bg = "#333842" }, - -- Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor - -- lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - -- CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM| - -- CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - -- -- overide nvimtree folder icon fill color - -- NvimTreeFolderIcon = { fg = "${gray}" }, - -- -- overide nvimtree text fill color folder opened - -- NvimTreeOpenedFolderName = { fg = "${blue}" }, - -- -- overide nvimtree text fill color root folder - -- NvimTreeRootFolder = { fg = "${yellow}" }, - -- NvimTreeSpecialFile = { fg = "${yellow}" }, - -- NvimTreeWinSeparator = { fg = "#202329" }, - -- NvimTreeIndentMarker = { fg = "#3E4450" }, - -- -- overide indenline fill color - -- IblIndent = { fg = "#3E4450" }, - -- -- overide cmp cursorline fill color with #333842 - -- PmenuSel = { bg = "#333842" }, - -- illuminatedWord = { bg = "#3b4261" }, - -- illuminatedCurWord = { bg = "#3b4261" }, - -- IlluminatedWordText = { bg = "#3b4261" }, - -- IlluminatedWordRead = { bg = "#3b4261" }, - -- IlluminatedWordWrite = { bg = "#3b4261" }, - -- StatusLine = { fg = "#f8f8f2", bg = "${bg}" }, - -- StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" }, - -- BufferLineFill = { bg = "${bg}" }, - -- ["@string.special.url.html"] = { fg = "${green}" }, - -- ["@text.uri.html"] = { fg = "${green}" }, - -- ["@tag.javascript"] = { fg = "${red}" }, - -- ["@constructor.javascript"] = { fg = "${red}" }, - -- Pmenu = { fg = "${fg}", bg = "${bg}" }, - -- PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. - -- -- overide lualine fill color with bg color - -- LualineNormal = { bg = "${bg}" }, - -- -- overide lualine_c fill color with bg color - -- LualineC = { bg = "${bg}" }, - -- -- overide lualine_x fill color with bg color - -- LualineX = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKey = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeySeperator = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyDesc = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyFloat = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyValue = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyBorder = { bg = "${bg}" }, - -- }, - -- }) - -- end, - -- }, + { "navarasu/onedark.nvim", enabled = false }, + { + "olimorris/onedarkpro.nvim", + priority = 1000, -- Ensure it loads first + config = function() + local is_transparent = false + require("onedarkpro").setup({ + styles = { + types = "NONE", + methods = "NONE", + numbers = "NONE", + strings = "NONE", + comments = "italic", + keywords = "bold,italic", + constants = "NONE", + functions = "italic", + operators = "NONE", + variables = "NONE", + parameters = "NONE", + conditionals = "italic", + virtual_text = "NONE", + tags = "italic", + }, + colors = { + onedark = { + green = "#99c379", + gray = "#8094b4", + red = "#e06c75", + purple = "#c678dd", + yellow = "#e5c07a", + blue = "#61afef", + cyan = "#56b6c2", + bg_statusline = "#282c34", + indentline = "#3b4261", + float_bg = "#282c34", + }, + }, + options = { + cursorline = true, + transparency = is_transparent, + terminal_colors = true, + }, + highlights = { + -- overide cursor line fill colors + LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + CursorLine = { bg = "#333842" }, + Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor + lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM| + CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + -- overide nvimtree folder icon fill color + NvimTreeFolderIcon = { fg = "${gray}" }, + -- overide nvimtree text fill color folder opened + NvimTreeOpenedFolderName = { fg = "${blue}" }, + -- overide nvimtree text fill color root folder + NvimTreeRootFolder = { fg = "${yellow}" }, + NvimTreeSpecialFile = { fg = "${orange}" }, + NvimTreeWinSeparator = { fg = "#202329" }, + NvimTreeIndentMarker = { fg = "#3E4450" }, + -- overide indenline fill color + IblIndent = { fg = "#3E4450" }, + -- overide cmp cursorline fill color with #333842 + PmenuSel = { bg = "#333842" }, + illuminatedWord = { bg = "#3b4261" }, + illuminatedCurWord = { bg = "#3b4261" }, + IlluminatedWordText = { bg = "#3b4261" }, + IlluminatedWordRead = { bg = "#3b4261" }, + IlluminatedWordWrite = { bg = "#3b4261" }, + StatusLine = { fg = "#f8f8f2", bg = is_transparent and "NONE" or "${bg}" }, + StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" }, + BufferLineFill = { bg = is_transparent and "NONE" or "${bg}" }, + ["@string.special.url.html"] = { fg = "${green}" }, + ["@text.uri.html"] = { fg = "${green}" }, + ["@tag.javascript"] = { fg = "${red}" }, + ["@tag.attribute"] = { fg = "${orange}", style = "italic" }, + ["@constructor.javascript"] = { fg = "${red}" }, + ["@variable"] = { fg = "${fg}", style = "NONE" }, -- various variable names + ["@variable.builtin"] = { fg = "${red}", style = "NONE" }, + ["@variable.member"] = "${cyan}", + ["@variable.parameter"] = "${red}", + ["@property"] = { fg = "${cyan}" }, -- similar to `@field` + NvimTreeGitDirty = { fg = "${yellow}" }, + Pmenu = { fg = "${fg}", bg = "${bg}" }, + PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. + -- overide lualine fill color with bg color + LualineNormal = { bg = "${bg}" }, + -- overide lualine_c fill color with bg color + LualineC = { bg = "${bg}" }, + -- overide lualine_x fill color with bg color + LualineX = { bg = "${bg}" }, + -- overide which-key fill color with bg color + -- WhichKey = { bg = "${bg}" }, + -- -- overide which-key fill color with bg color + -- WhichKeySeperator = { bg = "${bg}" }, + -- -- overide which-key fill color with bg color + -- WhichKeyDesc = { fg = "${red}" }, + -- -- overide which-key fill color with bg color + -- WhichKeyFloat = { bg = "${bg}" }, + WhichKeyFloat = { bg = is_transparent and "NONE" or "${bg}" }, + -- -- overide which-key fill color with bg color + -- WhichKeyValue = { bg = "${bg}" }, + -- -- overide which-key fill color with bg color + -- WhichKeyBorder = { bg = "${bg}" }, + }, + }) + end, + }, } diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index d7c78ed..c854f81 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -354,6 +354,7 @@ return { priority = 1000, config = function() -- Lua + local util = require("onedark.util") require("onedark").setup({ term_colors = true, style = onedark_style, @@ -383,7 +384,7 @@ return { -- BorderBG = { fg = "#333842" }, -- untuk custom brder color cmp -- overide indent line fill color NvimTreeNormal = { fg = "$fg", bg = "$bg0" }, - NvimTreeIndentMarker = { fg = "#3E4450" }, + NvimTreeIndentMarker = { fg = "#515661" }, -- NvimTreeGitIgnored = { fg = "$gray", bg = "NONE" }, IblIndent = { fg = "#3E4450" }, -- NvimTreeFolderIcon = { bg = "NONE", fg = "$blue" }, diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index c216418..f11a9e0 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -364,9 +364,29 @@ return { lazy = true, -- event = "BufWinEnter", event = { "BufRead", "InsertEnter", "BufNewFile" }, - opts = function() - require("user.colorizer") - end, + -- opts = function() + -- require("user.colorizer") + -- end, + 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 { diff --git a/lua/user/icons.lua b/lua/user/icons.lua index d275f33..c0f90fc 100644 --- a/lua/user/icons.lua +++ b/lua/user/icons.lua @@ -82,13 +82,13 @@ return { Calendar = "", Check = "", ChevronRight = "", - ChevronShortDown = "", + ChevronShortDown = "", ChevronShortLeft = "", ChevronShortRight = "", ChevronShortUp = "", ChevronShortDown2 = " ", ChevronShortLeft2 = "", - ChevronShortRight2 = " ", + ChevronShortRight2 = "", ChevronShortUp2 = "", Circle = " ", Close = "󰅖", diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua index 10469f5..24b4ce9 100644 --- a/lua/user/nvim-tree.lua +++ b/lua/user/nvim-tree.lua @@ -55,7 +55,7 @@ nvim_tree.setup({ root_folder_label = false, indent_width = 2, indent_markers = { - enable = false, + enable = true, inline_arrows = true, icons = { corner = "└", @@ -80,8 +80,10 @@ nvim_tree.setup({ symlink = icons.ui.FileSymlink, bookmark = icons.ui.BookMark, folder = { - arrow_closed = icons.ui.TriangleShortArrowRight, - arrow_open = icons.ui.TriangleShortArrowDown, + -- arrow_closed = icons.ui.TriangleShortArrowRight, + arrow_closed = icons.ui.ChevronShortRight, + -- arrow_open = icons.ui.TriangleShortArrowDown, + arrow_open = icons.ui.ChevronShortDown, default = icons.ui.Folder, open = icons.ui.FolderOpen, empty = icons.ui.EmptyFolder, diff --git a/lua/user/webdevicons.lua b/lua/user/webdevicons.lua index 0920f8a..1dd8bd4 100644 --- a/lua/user/webdevicons.lua +++ b/lua/user/webdevicons.lua @@ -155,6 +155,12 @@ material_icon.setup({ cterm_color = "220", name = "jpg", }, + ["jpeg"] = { + icon = "󰥶", + color = "#88C057", + cterm_color = "220", + name = "jpeg", + }, ["csv"] = { icon = "󰈚", color = "#57965c", @@ -493,5 +499,11 @@ web_devicons.setup({ cterm_color = "220", name = "gitlabciyaml", }, + [".env_example"] = { + icon = "", + color = "#faf743", + cterm_color = "227", + name = "Envexample", + }, }, }) From 7a06e075dfb6d5900ed1c2160cb02742e8671c42 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Sun, 21 Apr 2024 10:41:45 +0700 Subject: [PATCH 02/23] add: update config --- lazy-lock.json | 6 +++--- lua/custom/plugins/onedarkpro.lua | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 211f115..2f90d5c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -23,7 +23,7 @@ "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "none-ls-extras.nvim": { "branch": "main", "commit": "f0746bf4f1a21d6e1d2002f671fb9b46d2146de7" }, - "none-ls.nvim": { "branch": "main", "commit": "63457547ffb7c7223d0f91feb1145393cc7b6728" }, + "none-ls.nvim": { "branch": "main", "commit": "88821b67e6007041f43b802f58e3d9fa9bfce684" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, @@ -40,12 +40,12 @@ "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, - "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, + "onedarkpro.nvim": { "branch": "main", "commit": "ec07364f3cfa9cc6467bf067a490cfd74011efcd" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, - "telescope.nvim": { "branch": "master", "commit": "d00d9df48c00d8682c14c2b5da78bda7ef06b939" }, + "telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 844ab1a..2f8b478 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -103,6 +103,7 @@ return { -- WhichKeyValue = { bg = "${bg}" }, -- -- overide which-key fill color with bg color -- WhichKeyBorder = { bg = "${bg}" }, + TermCursor = { bg = "${fg}" }, }, }) end, From 515492b0025fbf8591728ab0ad7dbca8956bc88a Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Sun, 21 Apr 2024 13:28:26 +0700 Subject: [PATCH 03/23] add: update config theme onedarkpro --- lua/custom/plugins/onedarkpro.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 2f8b478..f886db6 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -12,9 +12,10 @@ return { numbers = "NONE", strings = "NONE", comments = "italic", - keywords = "bold,italic", + -- keywords = "bold,italic", + keywords = "italic", constants = "NONE", - functions = "italic", + functions = "NONE", operators = "NONE", variables = "NONE", parameters = "NONE", @@ -36,6 +37,9 @@ return { float_bg = "#282c34", }, }, + filetypes = { + -- javascript = false, + }, options = { cursorline = true, transparency = is_transparent, @@ -104,6 +108,8 @@ return { -- -- overide which-key fill color with bg color -- WhichKeyBorder = { bg = "${bg}" }, TermCursor = { bg = "${fg}" }, + TSRainbowRed = { fg = "${orange}" }, + TSRainbowOrange = { fg = "${red}" }, }, }) end, From 9a59894b681fe389f4ba36668b2bc34bf6534799 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Sun, 21 Apr 2024 15:48:23 +0700 Subject: [PATCH 04/23] add: update config --- lua/custom/plugins/onedarkpro.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index f886db6..047d993 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -4,7 +4,7 @@ return { "olimorris/onedarkpro.nvim", priority = 1000, -- Ensure it loads first config = function() - local is_transparent = false + local is_transparent = true require("onedarkpro").setup({ styles = { types = "NONE", @@ -41,9 +41,11 @@ return { -- javascript = false, }, options = { - cursorline = true, - transparency = is_transparent, - terminal_colors = true, + cursorline = false, -- Use cursorline highlighting? + transparency = is_transparent, -- Use a transparent background? + terminal_colors = true, -- Use the theme's colors for Neovim's :terminal? + lualine_transparency = is_transparent, -- Center bar transparency? + highlight_inactive_windows = false, -- When the window is out of focus, change the normal background? }, highlights = { -- overide cursor line fill colors @@ -107,6 +109,7 @@ return { -- WhichKeyValue = { bg = "${bg}" }, -- -- overide which-key fill color with bg color -- WhichKeyBorder = { bg = "${bg}" }, + -- Folded = { bg = "NONE", fg = "${fg}" }, -- line used for closed folds TermCursor = { bg = "${fg}" }, TSRainbowRed = { fg = "${orange}" }, TSRainbowOrange = { fg = "${red}" }, From c7ba5cb856676c9eba89216668c1fde82e6d7040 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Sun, 21 Apr 2024 17:11:13 +0700 Subject: [PATCH 05/23] add: update config --- lua/custom/plugins/onedarkpro.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 047d993..7f6a890 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -4,7 +4,7 @@ return { "olimorris/onedarkpro.nvim", priority = 1000, -- Ensure it loads first config = function() - local is_transparent = true + local is_transparent = false require("onedarkpro").setup({ styles = { types = "NONE", From 2c60cbeb7cb19047854bb9d81d83231f8fac7043 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Sun, 21 Apr 2024 19:50:14 +0700 Subject: [PATCH 06/23] add: update github theme --- lazy-lock.json | 1 + lua/core/init.lua | 2 +- lua/custom/plugins/githubdark.lua | 190 +++++++++++++++--------------- 3 files changed, 99 insertions(+), 94 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 2f90d5c..2bd1384 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,6 +13,7 @@ "codeium.vim": { "branch": "main", "commit": "76790ba8d1b8b3287f72366ea5f55c1d76e6114e" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, + "github-nvim-theme": { "branch": "main", "commit": "7e08e9cbf6da64b151f708a3e7e9f43447ae0171" }, "gitsigns.nvim": { "branch": "main", "commit": "52f8da33cc0cadbf1164c4a91c8bfd6895533d67" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index 4efce92..09eb45e 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -17,5 +17,5 @@ require("custom.autocmd") -- require("user.chat_gpt") -- vim.cmd("colorscheme one_monokai") -- vim.cmd("colorscheme onedark") --- vim.cmd("colorscheme github_dark_dimmed") +vim.cmd("colorscheme github_dark_dimmed") -- vim.cmd("colorscheme github_dark_high_contrast") diff --git a/lua/custom/plugins/githubdark.lua b/lua/custom/plugins/githubdark.lua index caf50b9..030fe48 100644 --- a/lua/custom/plugins/githubdark.lua +++ b/lua/custom/plugins/githubdark.lua @@ -1,95 +1,99 @@ return { - -- { - -- "navarasu/onedark.nvim", - -- enabled = false, - -- }, - -- { - -- "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 is_transparent = false - -- 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 = is_transparent, -- 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 = { - -- github_dark_dimmed = { - -- bg0 = is_transparent and "NONE" or "bg1", - -- bg1 = is_transparent and "NONE" or "bg", - -- }, - -- }, - -- specs = {}, - -- groups = { - -- all = { - -- illuminatedWord = { bg = "#3b4261" }, - -- illuminatedCurWord = { bg = "#3b4261" }, - -- IlluminatedWordText = { bg = "#3b4261" }, - -- IlluminatedWordRead = { bg = "#3b4261" }, - -- IlluminatedWordWrite = { bg = "#3b4261" }, - -- ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, - -- ["@text.uri"] = { fg = palette.const, style = "italic" }, - -- -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, - -- -- ["@operator.html"] = { fg = "#faa356" }, - -- -- ["@tag.html"] = { fg = "#fa7970" }, - -- -- ["@tag.delimiter.html"] = { fg = "#faa356" }, - -- }, - -- github_dark_high_contrast = { - -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - -- }, - -- github_dark_dimmed = { - -- -- As with specs and palettes, a specific style's value will be used over the `all`'s value. - -- NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, - -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - -- BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, - -- BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, - -- LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, - -- StatusLine = { bg = is_transparent and "NONE" or "bg1" }, - -- StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, - -- Pmenu = { bg = is_transparent and "NONE" or "bg1" }, - -- PmenuSel = { link = "CursorLine" }, - -- WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, - -- LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, - -- LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, - -- }, - -- }, - -- }) - -- end, - -- }, + { + "navarasu/onedark.nvim", + enabled = false, + }, + { + "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 is_transparent = false + 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 = is_transparent, -- 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 = { + github_dark_dimmed = { + bg0 = is_transparent and "NONE" or "bg1", + bg1 = is_transparent and "NONE" or "bg", + }, + }, + specs = {}, + groups = { + all = { + illuminatedWord = { bg = "#3b4261" }, + illuminatedCurWord = { bg = "#3b4261" }, + IlluminatedWordText = { bg = "#3b4261" }, + IlluminatedWordRead = { bg = "#3b4261" }, + IlluminatedWordWrite = { bg = "#3b4261" }, + ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, + ["@text.uri"] = { fg = palette.const, style = "italic" }, + ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, + -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, + -- ["@operator.html"] = { fg = "#faa356" }, + -- ["@tag.html"] = { fg = "#fa7970" }, + -- ["@tag.delimiter.html"] = { fg = "#faa356" }, + ["@tag.javascript"] = { fg = "#faa356" }, + ["@tag.tsx"] = { fg = "#faa356" }, + }, + github_dark_high_contrast = { + NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + }, + github_dark_dimmed = { + -- As with specs and palettes, a specific style's value will be used over the `all`'s value. + NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, + NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + NvimTreeIndentMarker = { fg = "#3E4450" }, + BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, + BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, + LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, + StatusLine = { bg = is_transparent and "NONE" or "bg1" }, + StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, + Pmenu = { bg = is_transparent and "NONE" or "bg1" }, + PmenuSel = { link = "CursorLine" }, + WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, + LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, + LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, + }, + }, + }) + end, + }, } From c7af34ff72e30809aa49c6837178db3000093129 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Mon, 22 Apr 2024 08:55:33 +0700 Subject: [PATCH 07/23] add: update colors scheme config --- lazy-lock.json | 1 - lua/core/init.lua | 2 +- lua/custom/plugins/githubdark.lua | 194 +++++++++++++++--------------- lua/custom/plugins/onedarkpro.lua | 8 +- 4 files changed, 103 insertions(+), 102 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 2bd1384..2f90d5c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,7 +13,6 @@ "codeium.vim": { "branch": "main", "commit": "76790ba8d1b8b3287f72366ea5f55c1d76e6114e" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "github-nvim-theme": { "branch": "main", "commit": "7e08e9cbf6da64b151f708a3e7e9f43447ae0171" }, "gitsigns.nvim": { "branch": "main", "commit": "52f8da33cc0cadbf1164c4a91c8bfd6895533d67" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index 09eb45e..4efce92 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -17,5 +17,5 @@ require("custom.autocmd") -- require("user.chat_gpt") -- vim.cmd("colorscheme one_monokai") -- vim.cmd("colorscheme onedark") -vim.cmd("colorscheme github_dark_dimmed") +-- vim.cmd("colorscheme github_dark_dimmed") -- vim.cmd("colorscheme github_dark_high_contrast") diff --git a/lua/custom/plugins/githubdark.lua b/lua/custom/plugins/githubdark.lua index 030fe48..8ff1867 100644 --- a/lua/custom/plugins/githubdark.lua +++ b/lua/custom/plugins/githubdark.lua @@ -1,99 +1,99 @@ return { - { - "navarasu/onedark.nvim", - enabled = false, - }, - { - "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 is_transparent = false - 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 = is_transparent, -- 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 = { - github_dark_dimmed = { - bg0 = is_transparent and "NONE" or "bg1", - bg1 = is_transparent and "NONE" or "bg", - }, - }, - specs = {}, - groups = { - all = { - illuminatedWord = { bg = "#3b4261" }, - illuminatedCurWord = { bg = "#3b4261" }, - IlluminatedWordText = { bg = "#3b4261" }, - IlluminatedWordRead = { bg = "#3b4261" }, - IlluminatedWordWrite = { bg = "#3b4261" }, - ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, - ["@text.uri"] = { fg = palette.const, style = "italic" }, - ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, - -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, - -- ["@operator.html"] = { fg = "#faa356" }, - -- ["@tag.html"] = { fg = "#fa7970" }, - -- ["@tag.delimiter.html"] = { fg = "#faa356" }, - ["@tag.javascript"] = { fg = "#faa356" }, - ["@tag.tsx"] = { fg = "#faa356" }, - }, - github_dark_high_contrast = { - NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - }, - github_dark_dimmed = { - -- As with specs and palettes, a specific style's value will be used over the `all`'s value. - NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, - NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - NvimTreeIndentMarker = { fg = "#3E4450" }, - BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, - BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, - LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, - StatusLine = { bg = is_transparent and "NONE" or "bg1" }, - StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, - Pmenu = { bg = is_transparent and "NONE" or "bg1" }, - PmenuSel = { link = "CursorLine" }, - WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, - LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, - LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, - }, - }, - }) - end, - }, + -- { + -- "navarasu/onedark.nvim", + -- enabled = false, + -- }, + -- { + -- "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 is_transparent = false + -- 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 = is_transparent, -- 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 = { + -- github_dark_dimmed = { + -- bg0 = is_transparent and "NONE" or "bg1", + -- bg1 = is_transparent and "NONE" or "bg", + -- }, + -- }, + -- specs = {}, + -- groups = { + -- all = { + -- illuminatedWord = { bg = "#3b4261" }, + -- illuminatedCurWord = { bg = "#3b4261" }, + -- IlluminatedWordText = { bg = "#3b4261" }, + -- IlluminatedWordRead = { bg = "#3b4261" }, + -- IlluminatedWordWrite = { bg = "#3b4261" }, + -- ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, + -- ["@text.uri"] = { fg = palette.const, style = "italic" }, + -- ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, + -- -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, + -- -- ["@operator.html"] = { fg = "#faa356" }, + -- -- ["@tag.html"] = { fg = "#fa7970" }, + -- -- ["@tag.delimiter.html"] = { fg = "#faa356" }, + -- ["@tag.javascript"] = { fg = "#faa356" }, + -- ["@tag.tsx"] = { fg = "#faa356" }, + -- }, + -- github_dark_high_contrast = { + -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + -- }, + -- github_dark_dimmed = { + -- -- As with specs and palettes, a specific style's value will be used over the `all`'s value. + -- NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, + -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + -- NvimTreeIndentMarker = { fg = "#3E4450" }, + -- BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, + -- BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, + -- LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, + -- StatusLine = { bg = is_transparent and "NONE" or "bg1" }, + -- StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, + -- Pmenu = { bg = is_transparent and "NONE" or "bg1" }, + -- PmenuSel = { link = "CursorLine" }, + -- WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, + -- LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, + -- LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, + -- }, + -- }, + -- }) + -- end, + -- }, } diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 7f6a890..427c41b 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -86,7 +86,9 @@ return { ["@variable.builtin"] = { fg = "${red}", style = "NONE" }, ["@variable.member"] = "${cyan}", ["@variable.parameter"] = "${red}", - ["@property"] = { fg = "${cyan}" }, -- similar to `@field` + -- ["@property.javascript"] = { fg = "${cyan}" }, -- similar to `@field` + ["@lsp.type.parameter"] = { fg = "${fg}" }, + ["@field.lua"] = { fg = "${gray}" }, NvimTreeGitDirty = { fg = "${yellow}" }, Pmenu = { fg = "${fg}", bg = "${bg}" }, PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. @@ -111,8 +113,8 @@ return { -- WhichKeyBorder = { bg = "${bg}" }, -- Folded = { bg = "NONE", fg = "${fg}" }, -- line used for closed folds TermCursor = { bg = "${fg}" }, - TSRainbowRed = { fg = "${orange}" }, - TSRainbowOrange = { fg = "${red}" }, + TSRainbowRed = { fg = "${cyan}" }, + TSRainbowCyan = { fg = "${red}" }, }, }) end, From 6153dea7ff11d1b4f3a8f3dddf48be44d6c9bb97 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Tue, 23 Apr 2024 18:56:29 +0700 Subject: [PATCH 08/23] add: update config --- lazy-lock.json | 8 +- lua/custom/plugins/lualine.lua | 282 ---- lua/custom/plugins/lualine_backup.lua | 576 ++++---- lua/custom/plugins/lualine_onedark.lua | 244 +++ lua/custom/plugins/onedarkpro.lua | 7 +- lua/plugins/ui.lua | 4 +- lua/user/{lualine.lua => lualine_cfg.lua} | 860 +++++------ lua/user/nvim-tree.lua | 4 +- lua/user/webdevicons.lua | 497 +------ lua/user/webdevicons_backup.lua | 1642 +++++++++++++++++++++ 10 files changed, 2617 insertions(+), 1507 deletions(-) delete mode 100644 lua/custom/plugins/lualine.lua create mode 100644 lua/custom/plugins/lualine_onedark.lua rename lua/user/{lualine.lua => lualine_cfg.lua} (96%) create mode 100644 lua/user/webdevicons_backup.lua diff --git a/lazy-lock.json b/lazy-lock.json index 2f90d5c..1bab449 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -18,7 +18,7 @@ "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, "lsp-progress.nvim": { "branch": "main", "commit": "83b16a9791fa788c0a7ca90374118ed15d2c09ed" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "2ba17cecfde8b8c7c7c287909a1e4de895223df6" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, @@ -26,10 +26,10 @@ "none-ls.nvim": { "branch": "main", "commit": "88821b67e6007041f43b802f58e3d9fa9bfce684" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, - "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, + "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, - "nvim-material-icon": { "branch": "main", "commit": "602088c2682e61cbebd7191de7dc88bfa90c6890" }, + "nvim-material-icon": { "branch": "main", "commit": "ee3d4f54a3bf9716b7f8ad5eefcaa53afebd24a1" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, @@ -46,7 +46,7 @@ "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, "telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" }, - "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, + "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" }, "vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua deleted file mode 100644 index 1422577..0000000 --- a/lua/custom/plugins/lualine.lua +++ /dev/null @@ -1,282 +0,0 @@ -return { - -- { - -- "nvim-lualine/lualine.nvim", - -- event = "insertEnter", - -- config = function() - -- local hide_in_width = function() - -- return vim.fn.winwidth(0) > 80 - -- end - -- local icons = require("user.icons") - -- - -- -- start for lsp - -- local list_registered_providers_names = function(filetype) - -- local s = require("null-ls.sources") - -- local available_sources = s.get_available(filetype) - -- local registered = {} - -- for _, source in ipairs(available_sources) do - -- for method in pairs(source.methods) do - -- registered[method] = registered[method] or {} - -- table.insert(registered[method], source.name) - -- end - -- end - -- return registered - -- end - -- - -- local null_ls = require("null-ls") - -- -- for formatter - -- local list_registered = function(filetype) - -- local method = null_ls.methods.FORMATTING - -- local registered_providers = list_registered_providers_names(filetype) - -- return registered_providers[method] or {} - -- end - -- - -- --- for linter - -- local alternative_methods = { - -- null_ls.methods.DIAGNOSTICS, - -- null_ls.methods.DIAGNOSTICS_ON_OPEN, - -- null_ls.methods.DIAGNOSTICS_ON_SAVE, - -- } - -- - -- local linter_list_registered = function(filetype) - -- local registered_providers = list_registered_providers_names(filetype) - -- local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m) - -- return registered_providers[m] or {} - -- end, alternative_methods)) - -- - -- return providers_for_methods - -- end - -- -- end for lsp - -- - -- local lsp_info = { - -- function() - -- local msg = "LS Inactive" - -- local buf_ft = vim.bo.filetype - -- local clients = vim.lsp.get_active_clients() - -- -- start register - -- local buf_clients = vim.lsp.buf_get_clients() - -- local buf_client_names = {} - -- if next(buf_clients) == nil then - -- -- TODO: clean up this if statement - -- if type(msg) == "boolean" or #msg == 0 then - -- return "LS Inactive" - -- end - -- return msg - -- end - -- -- add client - -- for _, client in pairs(buf_clients) do - -- if client.name ~= "null-ls" and client.name ~= "copilot" then - -- table.insert(buf_client_names, client.name) - -- end - -- end - -- -- add formatter - -- local supported_formatters = list_registered(buf_ft) - -- vim.list_extend(buf_client_names, supported_formatters) - -- -- add linter - -- local supported_linters = linter_list_registered(buf_ft) - -- vim.list_extend(buf_client_names, supported_linters) - -- -- decomple - -- local unique_client_names = vim.fn.uniq(buf_client_names) - -- local msg = table.concat(unique_client_names, ", ") - -- return msg - -- end, - -- --icon = " ", - -- icon = icons.ui.Gear .. "", - -- padding = 1, - -- } - -- - -- local diagnostics = { - -- "diagnostics", - -- sources = { "nvim_diagnostic" }, - -- sections = { "error", "warn" }, - -- -- symbols = { error = " ", warn = " " }, - -- symbols = { - -- error = icons.diagnostics.BoldError .. " ", - -- warn = icons.diagnostics.BoldWarning .. " ", - -- }, - -- colored = true, - -- update_in_insert = false, - -- always_visible = false, - -- } - -- - -- local diff = { - -- "diff", - -- colored = true, - -- -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols - -- symbols = { - -- added = icons.git.LineAdded .. " ", - -- modified = icons.git.LineModified .. " ", - -- removed = icons.git.LineRemoved .. " ", - -- }, -- changes diff symbols - -- cond = hide_in_width, - -- } - -- - -- local spaces = function() - -- -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") - -- return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") - -- end - -- - -- local mode = { - -- "mode", - -- padding = 1, - -- separator = { left = " " }, - -- -- right_padding = 3, - -- fmt = function(str) - -- return icons.ui.Neovim .. " " .. str - -- end, - -- } - -- local branch = { - -- "branch", - -- padding = 1, - -- } - -- - -- local get_branch = function() - -- if vim.b.gitsigns_head ~= nil then - -- return " " .. vim.b.gitsigns_head - -- else - -- return "" .. vim.fn.fnamemodify("", ":t") - -- end - -- end - -- - -- local lsp_progress = {} - -- local data_ok, lspprogress = pcall(require, "lsp-progress") - -- if data_ok then - -- lsp_progress = lspprogress.progress - -- end - -- -- stylua: ignore - -- local colors = { - -- blue = '#50fa7b', - -- cyan = '#f1fa8c', - -- black = '#1a1b26', - -- black_transparant = 'none', - -- white = '#c6c6c6', - -- red = "#ff757f", - -- skyblue_1 = '#bd93f9', - -- grey = '#5f6a8e', - -- yellow = "#ffb86c", - -- fg_gutter = "#3b4261", - -- green1 = "#bd93f9", - -- } - -- - -- -- check config for theme - -- local set_theme - -- 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 - -- - -- bubbles_theme = { - -- normal = { - -- a = { fg = colors.black, bg = colors.skyblue_1 }, - -- b = { fg = colors.white, bg = colors.grey }, - -- c = { fg = colors.white, bg = "none" }, - -- }, - -- - -- insert = { - -- a = { fg = colors.black, bg = colors.blue }, - -- b = { fg = colors.blue, bg = colors.grey }, - -- }, - -- visual = { - -- a = { fg = colors.black, bg = colors.cyan }, - -- b = { fg = colors.cyan, bg = colors.grey }, - -- }, - -- replace = { - -- a = { bg = colors.red, fg = colors.black }, - -- b = { bg = colors.fg_gutter, fg = colors.red }, - -- }, - -- command = { - -- a = { bg = colors.yellow, fg = colors.black }, - -- b = { bg = colors.fg_gutter, fg = colors.yellow }, - -- }, - -- terminal = { - -- a = { bg = colors.green1, fg = colors.black }, - -- b = { bg = colors.fg_gutter, fg = colors.green1 }, - -- }, - -- inactive = { - -- a = { fg = colors.white, bg = colors.black_transparant }, - -- b = { fg = colors.white, bg = colors.black_transparant }, - -- c = { fg = colors.black, bg = "#393f4a" }, - -- }, - -- } - -- - -- if set_theme == "auto" then - -- bubbles_theme = vim.fn.fnamemodify("auto", ":t") - -- end - -- - -- require("lualine").setup({ - -- options = { - -- theme = bubbles_theme, - -- -- theme = "auto", - -- component_separators = { left = "", right = "" }, - -- section_separators = { left = "", right = "" }, - -- disabled_filetypes = { - -- "TelescopePrompt", - -- "packer", - -- "alpha", - -- "dashboard", - -- "NvimTree", - -- "Outline", - -- "DressingInput", - -- "toggleterm", - -- "lazy", - -- "mason", - -- "neo-tree", - -- "startuptime", - -- }, - -- always_divide_middle = true, - -- }, - -- sections = { - -- lualine_a = { - -- mode, - -- }, - -- lualine_b = { "branch" }, - -- lualine_c = { lsp_info, diagnostics, lsp_progress }, - -- lualine_x = { diff, spaces, "filetype" }, - -- lualine_y = { "progress" }, - -- lualine_z = { - -- { "location", separator = { right = " " }, padding = { left = 1, right = 1 } }, - -- }, - -- }, - -- inactive_sections = { - -- lualine_a = { "filename" }, - -- lualine_b = {}, - -- lualine_c = {}, - -- lualine_x = {}, - -- lualine_y = {}, - -- lualine_z = { "location" }, - -- }, - -- tabline = {}, - -- extensions = {}, - -- }) - -- end, - -- }, -} diff --git a/lua/custom/plugins/lualine_backup.lua b/lua/custom/plugins/lualine_backup.lua index 964148c..277d956 100644 --- a/lua/custom/plugins/lualine_backup.lua +++ b/lua/custom/plugins/lualine_backup.lua @@ -1,290 +1,290 @@ return { - { - "nvim-lualine/lualine.nvim", - event = "InsertEnter", - config = function() - local hide_in_width = function() - return vim.fn.winwidth(0) > 80 - end - local icons = require("user.icons") - - local getLeftSubstring = function(word, length) - if #word > length then - return string.sub(word, 1, length) .. "..." - else - return word - end - end - - -- start for lsp - local list_registered_providers_names = function(filetype) - local s = require("null-ls.sources") - local available_sources = s.get_available(filetype) - local registered = {} - for _, source in ipairs(available_sources) do - for method in pairs(source.methods) do - registered[method] = registered[method] or {} - table.insert(registered[method], source.name) - end - end - return registered - end - - local null_ls = require("null-ls") - -- for formatter - local list_registered = function(filetype) - local method = null_ls.methods.FORMATTING - local registered_providers = list_registered_providers_names(filetype) - return registered_providers[method] or {} - end - - --- for linter - local alternative_methods = { - null_ls.methods.DIAGNOSTICS, - null_ls.methods.DIAGNOSTICS_ON_OPEN, - null_ls.methods.DIAGNOSTICS_ON_SAVE, - } - - local linter_list_registered = function(filetype) - local registered_providers = list_registered_providers_names(filetype) - local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m) - return registered_providers[m] or {} - end, alternative_methods)) - - return providers_for_methods - end - -- end for lsp - - local lsp_info = { - function() - local msg = "LS Inactive" - local buf_ft = vim.bo.filetype - local clients = vim.lsp.get_active_clients() - -- start register - local buf_clients = vim.lsp.buf_get_clients() - local buf_client_names = {} - if next(buf_clients) == nil then - -- TODO: clean up this if statement - if type(msg) == "boolean" or #msg == 0 then - return "LS Inactive" - end - return msg - end - -- add client - for _, client in pairs(buf_clients) do - if client.name ~= "null-ls" and client.name ~= "copilot" then - table.insert(buf_client_names, client.name) - end - end - -- add formatter - local supported_formatters = list_registered(buf_ft) - vim.list_extend(buf_client_names, supported_formatters) - -- add linter - local supported_linters = linter_list_registered(buf_ft) - vim.list_extend(buf_client_names, supported_linters) - -- decomple - local unique_client_names = vim.fn.uniq(buf_client_names) - local msg = table.concat(unique_client_names, ", ") - return msg - end, - --icon = " ", - icon = icons.ui.Gear .. "", - padding = 1, - } - - local diagnostics = { - "diagnostics", - sources = { "nvim_diagnostic" }, - sections = { "error", "warn" }, - -- symbols = { error = " ", warn = " " }, - symbols = { - error = icons.diagnostics.BoldError .. " ", - warn = icons.diagnostics.BoldWarning .. " ", - }, - colored = true, - update_in_insert = false, - always_visible = false, - } - - local diff = { - "diff", - colored = true, - -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols - symbols = { - added = icons.git.LineAdded .. " ", - modified = icons.git.LineModified .. " ", - removed = icons.git.LineRemoved .. " ", - }, -- changes diff symbols - cond = hide_in_width, - } - - local spaces = function() - -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") - return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") - end - - local mode = { - "mode", - padding = 1, - separator = { left = " " }, - -- right_padding = 3, - fmt = function(str) - return icons.ui.Neovim .. " " .. str - end, - } - local branch = { - "branch", - padding = 1, - } - - local get_branch = function() - if vim.b.gitsigns_head ~= nil then - return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6) - else - return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t") - end - end - - local lsp_progress = {} - local data_ok, lspprogress = pcall(require, "lsp-progress") - if data_ok then - lsp_progress = lspprogress.progress - end - -- stylua: ignore - local colors = { - blue = '#50fa7b', - cyan = '#f1fa8c', - black = '#1a1b26', - black_transparant = 'none', - white = '#c6c6c6', - red = "#ff757f", - skyblue_1 = '#bd93f9', - grey = '#5f6a8e', - yellow = "#ffb86c", - fg_gutter = "#3b4261", - green1 = "#bd93f9", - } - - -- check config for theme - local set_theme - 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 - - bubbles_theme = { - normal = { - a = { fg = colors.black, bg = colors.skyblue_1 }, - b = { fg = colors.white, bg = colors.grey }, - c = { fg = colors.white, bg = colors.black_transparant }, - }, - - insert = { - a = { fg = colors.black, bg = colors.blue }, - b = { fg = colors.blue, bg = colors.grey }, - }, - visual = { - a = { fg = colors.black, bg = colors.cyan }, - b = { fg = colors.cyan, bg = colors.grey }, - }, - replace = { - a = { bg = colors.red, fg = colors.black }, - b = { bg = colors.fg_gutter, fg = colors.red }, - }, - command = { - a = { bg = colors.yellow, fg = colors.black }, - b = { bg = colors.fg_gutter, fg = colors.yellow }, - }, - terminal = { - a = { bg = colors.green1, fg = colors.black }, - b = { bg = colors.fg_gutter, fg = colors.green1 }, - }, - inactive = { - a = { fg = colors.white, bg = colors.black_transparant }, - b = { fg = colors.white, bg = colors.black_transparant }, - c = { fg = colors.black, bg = colors.black_transparant }, - }, - } - - if set_theme == "auto" then - bubbles_theme = vim.fn.fnamemodify("auto", ":t") - end - - require("lualine").setup({ - options = { - theme = bubbles_theme, - -- theme = "auto", - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, - disabled_filetypes = { - "TelescopePrompt", - "packer", - "alpha", - "dashboard", - "NvimTree", - "Outline", - "DressingInput", - "toggleterm", - "lazy", - "mason", - "neo-tree", - "startuptime", - }, - always_divide_middle = true, - }, - sections = { - lualine_a = { - mode, - }, - lualine_b = { get_branch }, - lualine_c = { lsp_info, diagnostics, lsp_progress }, - lualine_x = { diff, spaces, "filetype" }, - lualine_y = { "progress" }, - lualine_z = { - { "location", separator = { right = " " }, padding = 1 }, - }, - }, - inactive_sections = { - lualine_a = { "filename" }, - lualine_b = {}, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = { "location" }, - }, - tabline = {}, - extensions = {}, - }) - end, - }, + -- { + -- "nvim-lualine/lualine.nvim", + -- event = "InsertEnter", + -- config = function() + -- local hide_in_width = function() + -- return vim.fn.winwidth(0) > 80 + -- end + -- local icons = require("user.icons") + -- + -- local getLeftSubstring = function(word, length) + -- if #word > length then + -- return string.sub(word, 1, length) .. "..." + -- else + -- return word + -- end + -- end + -- + -- -- start for lsp + -- local list_registered_providers_names = function(filetype) + -- local s = require("null-ls.sources") + -- local available_sources = s.get_available(filetype) + -- local registered = {} + -- for _, source in ipairs(available_sources) do + -- for method in pairs(source.methods) do + -- registered[method] = registered[method] or {} + -- table.insert(registered[method], source.name) + -- end + -- end + -- return registered + -- end + -- + -- local null_ls = require("null-ls") + -- -- for formatter + -- local list_registered = function(filetype) + -- local method = null_ls.methods.FORMATTING + -- local registered_providers = list_registered_providers_names(filetype) + -- return registered_providers[method] or {} + -- end + -- + -- --- for linter + -- local alternative_methods = { + -- null_ls.methods.DIAGNOSTICS, + -- null_ls.methods.DIAGNOSTICS_ON_OPEN, + -- null_ls.methods.DIAGNOSTICS_ON_SAVE, + -- } + -- + -- local linter_list_registered = function(filetype) + -- local registered_providers = list_registered_providers_names(filetype) + -- local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m) + -- return registered_providers[m] or {} + -- end, alternative_methods)) + -- + -- return providers_for_methods + -- end + -- -- end for lsp + -- + -- local lsp_info = { + -- function() + -- local msg = "LS Inactive" + -- local buf_ft = vim.bo.filetype + -- local clients = vim.lsp.get_active_clients() + -- -- start register + -- local buf_clients = vim.lsp.buf_get_clients() + -- local buf_client_names = {} + -- if next(buf_clients) == nil then + -- -- TODO: clean up this if statement + -- if type(msg) == "boolean" or #msg == 0 then + -- return "LS Inactive" + -- end + -- return msg + -- end + -- -- add client + -- for _, client in pairs(buf_clients) do + -- if client.name ~= "null-ls" and client.name ~= "copilot" then + -- table.insert(buf_client_names, client.name) + -- end + -- end + -- -- add formatter + -- local supported_formatters = list_registered(buf_ft) + -- vim.list_extend(buf_client_names, supported_formatters) + -- -- add linter + -- local supported_linters = linter_list_registered(buf_ft) + -- vim.list_extend(buf_client_names, supported_linters) + -- -- decomple + -- local unique_client_names = vim.fn.uniq(buf_client_names) + -- local msg = table.concat(unique_client_names, ", ") + -- return msg + -- end, + -- --icon = " ", + -- icon = icons.ui.Gear .. "", + -- padding = 1, + -- } + -- + -- local diagnostics = { + -- "diagnostics", + -- sources = { "nvim_diagnostic" }, + -- sections = { "error", "warn" }, + -- -- symbols = { error = " ", warn = " " }, + -- symbols = { + -- error = icons.diagnostics.BoldError .. " ", + -- warn = icons.diagnostics.BoldWarning .. " ", + -- }, + -- colored = true, + -- update_in_insert = false, + -- always_visible = false, + -- } + -- + -- local diff = { + -- "diff", + -- colored = true, + -- -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols + -- symbols = { + -- added = icons.git.LineAdded .. " ", + -- modified = icons.git.LineModified .. " ", + -- removed = icons.git.LineRemoved .. " ", + -- }, -- changes diff symbols + -- cond = hide_in_width, + -- } + -- + -- local spaces = function() + -- -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") + -- return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") + -- end + -- + -- local mode = { + -- "mode", + -- padding = 1, + -- separator = { left = " " }, + -- -- right_padding = 3, + -- fmt = function(str) + -- return icons.ui.Neovim .. " " .. str + -- end, + -- } + -- local branch = { + -- "branch", + -- padding = 1, + -- } + -- + -- local get_branch = function() + -- if vim.b.gitsigns_head ~= nil then + -- return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6) + -- else + -- return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t") + -- end + -- end + -- + -- local lsp_progress = {} + -- local data_ok, lspprogress = pcall(require, "lsp-progress") + -- if data_ok then + -- lsp_progress = lspprogress.progress + -- end + -- -- stylua: ignore + -- local colors = { + -- blue = '#50fa7b', + -- cyan = '#f1fa8c', + -- black = '#1a1b26', + -- black_transparant = 'none', + -- white = '#c6c6c6', + -- red = "#ff757f", + -- skyblue_1 = '#bd93f9', + -- grey = '#5f6a8e', + -- yellow = "#ffb86c", + -- fg_gutter = "#3b4261", + -- green1 = "#bd93f9", + -- } + -- + -- -- check config for theme + -- local set_theme + -- 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 + -- + -- bubbles_theme = { + -- normal = { + -- a = { fg = colors.black, bg = colors.skyblue_1 }, + -- b = { fg = colors.white, bg = colors.grey }, + -- c = { fg = colors.white, bg = colors.black_transparant }, + -- }, + -- + -- insert = { + -- a = { fg = colors.black, bg = colors.blue }, + -- b = { fg = colors.blue, bg = colors.grey }, + -- }, + -- visual = { + -- a = { fg = colors.black, bg = colors.cyan }, + -- b = { fg = colors.cyan, bg = colors.grey }, + -- }, + -- replace = { + -- a = { bg = colors.red, fg = colors.black }, + -- b = { bg = colors.fg_gutter, fg = colors.red }, + -- }, + -- command = { + -- a = { bg = colors.yellow, fg = colors.black }, + -- b = { bg = colors.fg_gutter, fg = colors.yellow }, + -- }, + -- terminal = { + -- a = { bg = colors.green1, fg = colors.black }, + -- b = { bg = colors.fg_gutter, fg = colors.green1 }, + -- }, + -- inactive = { + -- a = { fg = colors.white, bg = colors.black_transparant }, + -- b = { fg = colors.white, bg = colors.black_transparant }, + -- c = { fg = colors.black, bg = colors.black_transparant }, + -- }, + -- } + -- + -- if set_theme == "auto" then + -- bubbles_theme = vim.fn.fnamemodify("auto", ":t") + -- end + -- + -- require("lualine").setup({ + -- options = { + -- theme = bubbles_theme, + -- -- theme = "auto", + -- component_separators = { left = "", right = "" }, + -- section_separators = { left = "", right = "" }, + -- disabled_filetypes = { + -- "TelescopePrompt", + -- "packer", + -- "alpha", + -- "dashboard", + -- "NvimTree", + -- "Outline", + -- "DressingInput", + -- "toggleterm", + -- "lazy", + -- "mason", + -- "neo-tree", + -- "startuptime", + -- }, + -- always_divide_middle = true, + -- }, + -- sections = { + -- lualine_a = { + -- mode, + -- }, + -- lualine_b = { get_branch }, + -- lualine_c = { lsp_info, diagnostics, lsp_progress }, + -- lualine_x = { diff, spaces, "filetype" }, + -- lualine_y = { "progress" }, + -- lualine_z = { + -- { "location", separator = { right = " " }, padding = 1 }, + -- }, + -- }, + -- inactive_sections = { + -- lualine_a = { "filename" }, + -- lualine_b = {}, + -- lualine_c = {}, + -- lualine_x = {}, + -- lualine_y = {}, + -- lualine_z = { "location" }, + -- }, + -- tabline = {}, + -- extensions = {}, + -- }) + -- end, + -- }, } diff --git a/lua/custom/plugins/lualine_onedark.lua b/lua/custom/plugins/lualine_onedark.lua new file mode 100644 index 0000000..e330c37 --- /dev/null +++ b/lua/custom/plugins/lualine_onedark.lua @@ -0,0 +1,244 @@ +return { + { + "nvim-lualine/lualine.nvim", + event = "InsertEnter", + config = function() + local hide_in_width = function() + return vim.fn.winwidth(0) > 80 + end + local icons = require("user.icons") + + local getLeftSubstring = function(word, length) + if #word > length then + return string.sub(word, 1, length) .. "..." + else + return word + end + end + + -- start for lsp + local list_registered_providers_names = function(filetype) + local s = require("null-ls.sources") + local available_sources = s.get_available(filetype) + local registered = {} + for _, source in ipairs(available_sources) do + for method in pairs(source.methods) do + registered[method] = registered[method] or {} + table.insert(registered[method], source.name) + end + end + return registered + end + + local null_ls = require("null-ls") + -- for formatter + local list_registered = function(filetype) + local method = null_ls.methods.FORMATTING + local registered_providers = list_registered_providers_names(filetype) + return registered_providers[method] or {} + end + + --- for linter + local alternative_methods = { + null_ls.methods.DIAGNOSTICS, + null_ls.methods.DIAGNOSTICS_ON_OPEN, + null_ls.methods.DIAGNOSTICS_ON_SAVE, + } + + local linter_list_registered = function(filetype) + local registered_providers = list_registered_providers_names(filetype) + local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m) + return registered_providers[m] or {} + end, alternative_methods)) + + return providers_for_methods + end + -- end for lsp + + local lsp_info = { + function() + local msg = "LS Inactive" + local buf_ft = vim.bo.filetype + local clients = vim.lsp.get_active_clients() + -- start register + local buf_clients = vim.lsp.buf_get_clients() + local buf_client_names = {} + if next(buf_clients) == nil then + -- TODO: clean up this if statement + if type(msg) == "boolean" or #msg == 0 then + return "LS Inactive" + end + return msg + end + -- add client + for _, client in pairs(buf_clients) do + if client.name ~= "null-ls" and client.name ~= "copilot" then + table.insert(buf_client_names, client.name) + end + end + -- add formatter + local supported_formatters = list_registered(buf_ft) + vim.list_extend(buf_client_names, supported_formatters) + -- add linter + local supported_linters = linter_list_registered(buf_ft) + vim.list_extend(buf_client_names, supported_linters) + -- decomple + local unique_client_names = vim.fn.uniq(buf_client_names) + local msg = table.concat(unique_client_names, ", ") + return msg + end, + --icon = " ", + icon = icons.ui.Gear .. "", + padding = 1, + } + + local diagnostics = { + "diagnostics", + sources = { "nvim_diagnostic" }, + sections = { "error", "warn" }, + -- symbols = { error = " ", warn = " " }, + symbols = { + error = icons.diagnostics.BoldError .. " ", + warn = icons.diagnostics.BoldWarning .. " ", + }, + colored = true, + update_in_insert = false, + always_visible = false, + } + + local diff = { + "diff", + colored = true, + -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols + symbols = { + added = icons.git.LineAdded .. " ", + modified = icons.git.LineModified .. " ", + removed = icons.git.LineRemoved .. " ", + }, -- changes diff symbols + cond = hide_in_width, + } + + local spaces = function() + -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") + return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") + end + + local mode = { + "mode", + padding = 1, + separator = { left = " " }, + -- right_padding = 3, + fmt = function(str) + return icons.ui.Neovim .. " " .. str + end, + } + local branch = { + "branch", + padding = 1, + } + + local get_branch = function() + if vim.b.gitsigns_head ~= nil then + return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6) + else + return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t") + end + end + + local lsp_progress = {} + local data_ok, lspprogress = pcall(require, "lsp-progress") + if data_ok then + lsp_progress = lspprogress.progress + end + -- stylua: ignore + local is_transparat=true + local colors = require("onedarkpro.helpers").get_colors("onedark") + + local onedark = { + normal = { + a = { bg = colors.green, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.green }, + c = { + bg = is_transparat and colors.none or colors.bg_statusline, + fg = colors.fg, + }, + }, + + insert = { + a = { bg = colors.blue, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.blue }, + }, + visual = { + a = { bg = colors.yellow, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.yellow }, + }, + replace = { + a = { bg = colors.red, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.red }, + }, + command = { + a = { bg = colors.purple, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.purple }, + }, + terminal = { + a = { bg = colors.cyan, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.cyan }, + }, + inactive = { + a = { bg = colors.bg, fg = colors.blue }, + b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" }, + c = { + bg = is_transparat and colors.none or colors.bg, + fg = colors.fg_gutter_inactive, + }, + }, + } + + require("lualine").setup({ + options = { + theme = onedark, + -- theme = "auto", + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = { + "TelescopePrompt", + "packer", + "alpha", + "dashboard", + "NvimTree", + "Outline", + "DressingInput", + "toggleterm", + "lazy", + "mason", + "neo-tree", + "startuptime", + }, + always_divide_middle = true, + }, + sections = { + lualine_a = { + mode, + }, + lualine_b = { get_branch }, + lualine_c = { lsp_info, diagnostics, lsp_progress }, + lualine_x = { diff, spaces, "filetype" }, + lualine_y = { "progress" }, + lualine_z = { + { "location", separator = { right = " " }, padding = 1 }, + }, + }, + inactive_sections = { + lualine_a = { "filename" }, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { "location" }, + }, + tabline = {}, + extensions = {}, + }) + end, + }, +} diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 427c41b..7168ca2 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -41,7 +41,7 @@ return { -- javascript = false, }, options = { - cursorline = false, -- Use cursorline highlighting? + cursorline = true, -- Use cursorline highlighting? transparency = is_transparent, -- Use a transparent background? terminal_colors = true, -- Use the theme's colors for Neovim's :terminal? lualine_transparency = is_transparent, -- Center bar transparency? @@ -82,13 +82,14 @@ return { ["@tag.javascript"] = { fg = "${red}" }, ["@tag.attribute"] = { fg = "${orange}", style = "italic" }, ["@constructor.javascript"] = { fg = "${red}" }, - ["@variable"] = { fg = "${fg}", style = "NONE" }, -- various variable names + -- ["@variable"] = { fg = "${fg}", style = "NONE" }, -- various variable names ["@variable.builtin"] = { fg = "${red}", style = "NONE" }, ["@variable.member"] = "${cyan}", ["@variable.parameter"] = "${red}", -- ["@property.javascript"] = { fg = "${cyan}" }, -- similar to `@field` ["@lsp.type.parameter"] = { fg = "${fg}" }, - ["@field.lua"] = { fg = "${gray}" }, + ["@lsp.type.property.lua"] = { fg = "${red}" }, + ["@lsp.type.variable.lua"] = { fg = "${fg}" }, NvimTreeGitDirty = { fg = "${yellow}" }, Pmenu = { fg = "${fg}", bg = "${bg}" }, PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 0b2d948..1eec144 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -17,14 +17,14 @@ return { -- event = "BufWinEnter", event = { "BufRead", "BufNewFile" }, config = function() - require("user.lualine") + require("user.lualine_cfg") end, }, -- for show icon { "kyazdani42/nvim-web-devicons", lazy = true, - dependencies = { "DaikyXendo/nvim-material-icon" }, + dependencies = { "pojokcodeid/nvim-material-icon" }, -- event = "BufRead", config = function() require("user.webdevicons") diff --git a/lua/user/lualine.lua b/lua/user/lualine_cfg.lua similarity index 96% rename from lua/user/lualine.lua rename to lua/user/lualine_cfg.lua index 9f3e233..25203d8 100644 --- a/lua/user/lualine.lua +++ b/lua/user/lualine_cfg.lua @@ -1,430 +1,430 @@ -local status_ok, lualine = pcall(require, "lualine") -if not status_ok then - return -end -local icons = require("user.icons") -local hide_in_width = function() - return vim.fn.winwidth(0) > 80 -end - -local conditions = { - buffer_not_empty = function() - return vim.fn.empty(vim.fn.expand("%:t")) ~= 1 - end, - hide_in_width = function() - return vim.fn.winwidth(0) > 80 - end, - check_git_workspace = function() - local filepath = vim.fn.expand("%:p:h") - local gitdir = vim.fn.finddir(".git", filepath .. ";") - return gitdir and #gitdir > 0 and #gitdir < #filepath - end, -} - -local diagnostics = { - "diagnostics", - sources = { "nvim_diagnostic" }, - sections = { "error", "warn" }, - -- symbols = { error = " ", warn = " " }, - symbols = { - error = icons.diagnostics.BoldError .. " ", - warn = icons.diagnostics.BoldWarning .. " ", - }, - colored = true, - update_in_insert = false, - always_visible = false, -} - -local diff = { - "diff", - colored = true, - -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols - symbols = { - added = icons.git.LineAdded .. " ", - modified = icons.git.LineModified .. " ", - removed = icons.git.LineRemoved .. " ", - }, -- changes diff symbols - cond = hide_in_width, -} - --- for config style -local component_separators = { left = "", right = "" } -local section_separators = { left = "", right = "" } -local icon_mode = "" -local sts_mode = 0 - -local data_exists, custom_ui = pcall(require, "core.config") -if data_exists then - local ui_style = custom_ui.lualine_style - if ui_style ~= nil then - if custom_ui.lualine_style == 1 then - component_separators = { left = "", right = "" } - section_separators = { left = "", right = "" } - elseif custom_ui.lualine_style == 2 then - component_separators = { left = "", right = "" } - section_separators = { left = " ", right = " " } - elseif custom_ui.lualine_style == 3 then - component_separators = { left = "", right = "" } - section_separators = { left = "", right = "" } - end - end - local ui_icon = custom_ui.status_icon - if ui_icon ~= nil then - if custom_ui.status_icon == 1 then - icon_mode = " " - sts_mode = 1 - elseif custom_ui.status_icon == 2 then - icon_mode = " " - sts_mode = 1 - end - end - local custom_style = custom_ui.custom_lualine - if custom_style ~= nil and custom_style == true then - local comp = custom_ui.component_separators - local section = custom_ui.section_separators - if comp ~= nil and section ~= nil then - component_separators = comp - section_separators = section - end - end -end - -local mode = { - "mode", - padding = 1, - fmt = function(str) - -- if str == "NORMAL" then - -- str = "NOR" - -- elseif str == "INSERT" then - -- str = "INS" - -- elseif str == "VISUAL" then - -- str = "VIS" - -- elseif str == "COMMAND" then - -- str = "CMD" - -- else - -- str = str - -- end - - if sts_mode == 0 then - -- return "--" .. str .. "--" - return " " .. str - else - return icon_mode - end - end, -} - -local filetype = { - "filetype", - icons_enabled = true, - icon = nil, -} - -local branch = { - "branch", - icons_enabled = true, - --icon = "", - icon = icons.git.Branch, - padding = 1, -} - -local location = { - "location", - padding = 1, -} - --- cool function for progress -local progress = function() - local current_line = vim.fn.line(".") - local total_lines = vim.fn.line("$") - local chars = { "__", "▁▁", "▂▂", "▃▃", "▄▄", "▅▅", "▆▆", "▇▇", "██" } - local line_ratio = current_line / total_lines - local index = math.ceil(line_ratio * #chars) - return chars[index] -end - -local time = function() - return " " .. os.date("%R") -end - -local spaces = function() - -- return "->| " .. vim.api.nvim_buf_get_option(0, "shiftwidth") - return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") -end - -local file_name = { - "filename", - cond = conditions.buffer_not_empty, -} - --- start for lsp -local list_registered_providers_names = function(filetype) - local s = require("null-ls.sources") - local available_sources = s.get_available(filetype) - local registered = {} - for _, source in ipairs(available_sources) do - for method in pairs(source.methods) do - registered[method] = registered[method] or {} - table.insert(registered[method], source.name) - end - end - return registered -end - -local null_ls = require("null-ls") --- for formatter -local list_registered = function(filetype) - local method = null_ls.methods.FORMATTING - local registered_providers = list_registered_providers_names(filetype) - return registered_providers[method] or {} -end - ---- for linter -local alternative_methods = { - null_ls.methods.DIAGNOSTICS, - null_ls.methods.DIAGNOSTICS_ON_OPEN, - null_ls.methods.DIAGNOSTICS_ON_SAVE, -} - -local linter_list_registered = function(filetype) - local registered_providers = list_registered_providers_names(filetype) - local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m) - return registered_providers[m] or {} - end, alternative_methods)) - - return providers_for_methods -end --- end for lsp - -local lsp_info = { - function() - --local msg = "No Active Lsp" - local msg = "LS Inactive" - -- local buf_ft = vim.api.nvim_buf_get_option(0, "filetype") - local buf_ft = vim.bo.filetype - local clients = vim.lsp.get_active_clients() - -- start register - local buf_clients = vim.lsp.buf_get_clients() - local buf_client_names = {} - if next(buf_clients) == nil then - -- TODO: clean up this if statement - if type(msg) == "boolean" or #msg == 0 then - return "LS Inactive" - end - return msg - end - -- add client - for _, client in pairs(buf_clients) do - if client.name ~= "null-ls" and client.name ~= "copilot" then - table.insert(buf_client_names, client.name) - end - end - -- add formatter - local supported_formatters = list_registered(buf_ft) - vim.list_extend(buf_client_names, supported_formatters) - -- add linter - local supported_linters = linter_list_registered(buf_ft) - vim.list_extend(buf_client_names, supported_linters) - -- decomple - local unique_client_names = vim.fn.uniq(buf_client_names) - local msg = table.concat(unique_client_names, ", ") - return msg - end, - --icon = " ", - icon = icons.ui.Gear .. "", - padding = 1, -} -local lsp_progress = {} -local data_exists, lspprogress = pcall(require, "lsp-progress") -if data_exists then - lsp_progress = lspprogress.progress -end - -local clear_lualine = require("core.config").clear_lualine -if clear_lualine ~= nil then - if clear_lualine == 1 then - lualine.setup({ - options = { - icons_enabled = true, - theme = "auto", - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, - disabled_filetypes = { - "TelescopePrompt", - "packer", - "alpha", - "dashboard", - "NvimTree", - "Outline", - "DressingInput", - "toggleterm", - "lazy", - "mason", - "neo-tree", - }, - always_divide_middle = true, - }, - - sections = { - lualine_a = {}, - lualine_b = { mode, branch }, - lualine_c = { lsp_info, diagnostics, lsp_progress }, - -- lualine_c = { file_name, lsp_info }, - -- lualine_x = { "encoding", "fileformat", "filetype" }, - -- lualine_x = { diff, spaces, "encoding", filetype }, - lualine_x = { diff, spaces, filetype }, - lualine_y = { location, time }, - --[[ lualine_z = { progress }, ]] - lualine_z = {}, - }, - inactive_sections = { - lualine_a = {}, - lualine_b = {}, - lualine_c = { "filename" }, - lualine_x = { "location" }, - lualine_y = {}, - lualine_z = {}, - }, - tabline = {}, - extensions = {}, - }) - else - lualine.setup({ - options = { - icons_enabled = true, - theme = "auto", - component_separators = component_separators, - section_separators = section_separators, - disabled_filetypes = { - "TelescopePrompt", - "packer", - "alpha", - "dashboard", - "NvimTree", - "Outline", - "DressingInput", - "toggleterm", - "lazy", - "mason", - "neo-tree", - }, - always_divide_middle = true, - }, - - sections = { - lualine_a = { mode }, - lualine_b = { branch }, - lualine_c = { lsp_info, diagnostics, lsp_progress }, - -- lualine_c = { file_name, lsp_info }, - -- lualine_x = { "encoding", "fileformat", "filetype" }, - -- lualine_x = { diff, spaces, "encoding", filetype }, - lualine_x = { diff, spaces, filetype }, - lualine_y = { location }, - --[[ lualine_z = { progress }, ]] - lualine_z = { time }, - }, - inactive_sections = { - lualine_a = {}, - lualine_b = {}, - lualine_c = { "filename" }, - lualine_x = { "location" }, - lualine_y = {}, - lualine_z = {}, - }, - tabline = {}, - extensions = {}, - }) - end -else - lualine.setup({ - options = { - icons_enabled = true, - theme = "auto", - component_separators = component_separators, - section_separators = section_separators, - disabled_filetypes = { - "TelescopePrompt", - "packer", - "alpha", - "dashboard", - "NvimTree", - "Outline", - "DressingInput", - "toggleterm", - "lazy", - "mason", - "neo-tree", - }, - always_divide_middle = true, - }, - - sections = { - lualine_a = { mode }, - lualine_b = { branch }, - lualine_c = { lsp_info, diagnostics, lsp_progress }, - -- lualine_c = { file_name, lsp_info }, - -- lualine_x = { "encoding", "fileformat", "filetype" }, - -- lualine_x = { diff, spaces, "encoding", filetype }, - lualine_x = { diff, spaces, filetype }, - lualine_y = { location }, - --[[ lualine_z = { progress }, ]] - lualine_z = { time }, - }, - inactive_sections = { - lualine_a = {}, - lualine_b = {}, - lualine_c = { "filename" }, - lualine_x = { "location" }, - lualine_y = {}, - lualine_z = {}, - }, - tabline = {}, - extensions = {}, - }) -end - --- lualine.setup({ --- options = { --- icons_enabled = true, --- theme = "auto", --- component_separators = component_separators, --- section_separators = section_separators, --- disabled_filetypes = { --- "TelescopePrompt", --- "packer", --- "alpha", --- "dashboard", --- "NvimTree", --- "Outline", --- "DressingInput", --- "toggleterm", --- "lazy", --- "mason", --- "neo-tree", --- }, --- always_divide_middle = true, --- }, --- --- sections = { --- lualine_a = { mode }, --- lualine_b = { branch }, --- lualine_c = { lsp_info, diagnostics, lsp_progress }, --- -- lualine_c = { file_name, lsp_info }, --- -- lualine_x = { "encoding", "fileformat", "filetype" }, --- -- lualine_x = { diff, spaces, "encoding", filetype }, --- lualine_x = { diff, spaces, filetype }, --- lualine_y = { location }, --- --[[ lualine_z = { progress }, ]] --- lualine_z = { time }, --- }, --- inactive_sections = { --- lualine_a = {}, --- lualine_b = {}, --- lualine_c = { "filename" }, --- lualine_x = { "location" }, --- lualine_y = {}, --- lualine_z = {}, --- }, --- tabline = {}, --- extensions = {}, --- }) +local status_ok, lualine = pcall(require, "lualine") +if not status_ok then + return +end +local icons = require("user.icons") +local hide_in_width = function() + return vim.fn.winwidth(0) > 80 +end + +local conditions = { + buffer_not_empty = function() + return vim.fn.empty(vim.fn.expand("%:t")) ~= 1 + end, + hide_in_width = function() + return vim.fn.winwidth(0) > 80 + end, + check_git_workspace = function() + local filepath = vim.fn.expand("%:p:h") + local gitdir = vim.fn.finddir(".git", filepath .. ";") + return gitdir and #gitdir > 0 and #gitdir < #filepath + end, +} + +local diagnostics = { + "diagnostics", + sources = { "nvim_diagnostic" }, + sections = { "error", "warn" }, + -- symbols = { error = " ", warn = " " }, + symbols = { + error = icons.diagnostics.BoldError .. " ", + warn = icons.diagnostics.BoldWarning .. " ", + }, + colored = true, + update_in_insert = false, + always_visible = false, +} + +local diff = { + "diff", + colored = true, + -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols + symbols = { + added = icons.git.LineAdded .. " ", + modified = icons.git.LineModified .. " ", + removed = icons.git.LineRemoved .. " ", + }, -- changes diff symbols + cond = hide_in_width, +} + +-- for config style +local component_separators = { left = "", right = "" } +local section_separators = { left = "", right = "" } +local icon_mode = "" +local sts_mode = 0 + +local data_exists, custom_ui = pcall(require, "core.config") +if data_exists then + local ui_style = custom_ui.lualine_style + if ui_style ~= nil then + if custom_ui.lualine_style == 1 then + component_separators = { left = "", right = "" } + section_separators = { left = "", right = "" } + elseif custom_ui.lualine_style == 2 then + component_separators = { left = "", right = "" } + section_separators = { left = " ", right = " " } + elseif custom_ui.lualine_style == 3 then + component_separators = { left = "", right = "" } + section_separators = { left = "", right = "" } + end + end + local ui_icon = custom_ui.status_icon + if ui_icon ~= nil then + if custom_ui.status_icon == 1 then + icon_mode = " " + sts_mode = 1 + elseif custom_ui.status_icon == 2 then + icon_mode = " " + sts_mode = 1 + end + end + local custom_style = custom_ui.custom_lualine + if custom_style ~= nil and custom_style == true then + local comp = custom_ui.component_separators + local section = custom_ui.section_separators + if comp ~= nil and section ~= nil then + component_separators = comp + section_separators = section + end + end +end + +local mode = { + "mode", + padding = 1, + fmt = function(str) + -- if str == "NORMAL" then + -- str = "NOR" + -- elseif str == "INSERT" then + -- str = "INS" + -- elseif str == "VISUAL" then + -- str = "VIS" + -- elseif str == "COMMAND" then + -- str = "CMD" + -- else + -- str = str + -- end + + if sts_mode == 0 then + -- return "--" .. str .. "--" + return " " .. str + else + return icon_mode + end + end, +} + +local filetype = { + "filetype", + icons_enabled = true, + icon = nil, +} + +local branch = { + "branch", + icons_enabled = true, + --icon = "", + icon = icons.git.Branch, + padding = 1, +} + +local location = { + "location", + padding = 1, +} + +-- cool function for progress +local progress = function() + local current_line = vim.fn.line(".") + local total_lines = vim.fn.line("$") + local chars = { "__", "▁▁", "▂▂", "▃▃", "▄▄", "▅▅", "▆▆", "▇▇", "██" } + local line_ratio = current_line / total_lines + local index = math.ceil(line_ratio * #chars) + return chars[index] +end + +local time = function() + return " " .. os.date("%R") +end + +local spaces = function() + -- return "->| " .. vim.api.nvim_buf_get_option(0, "shiftwidth") + return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") +end + +local file_name = { + "filename", + cond = conditions.buffer_not_empty, +} + +-- start for lsp +local list_registered_providers_names = function(filetype) + local s = require("null-ls.sources") + local available_sources = s.get_available(filetype) + local registered = {} + for _, source in ipairs(available_sources) do + for method in pairs(source.methods) do + registered[method] = registered[method] or {} + table.insert(registered[method], source.name) + end + end + return registered +end + +local null_ls = require("null-ls") +-- for formatter +local list_registered = function(filetype) + local method = null_ls.methods.FORMATTING + local registered_providers = list_registered_providers_names(filetype) + return registered_providers[method] or {} +end + +--- for linter +local alternative_methods = { + null_ls.methods.DIAGNOSTICS, + null_ls.methods.DIAGNOSTICS_ON_OPEN, + null_ls.methods.DIAGNOSTICS_ON_SAVE, +} + +local linter_list_registered = function(filetype) + local registered_providers = list_registered_providers_names(filetype) + local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m) + return registered_providers[m] or {} + end, alternative_methods)) + + return providers_for_methods +end +-- end for lsp + +local lsp_info = { + function() + --local msg = "No Active Lsp" + local msg = "LS Inactive" + -- local buf_ft = vim.api.nvim_buf_get_option(0, "filetype") + local buf_ft = vim.bo.filetype + local clients = vim.lsp.get_active_clients() + -- start register + local buf_clients = vim.lsp.buf_get_clients() + local buf_client_names = {} + if next(buf_clients) == nil then + -- TODO: clean up this if statement + if type(msg) == "boolean" or #msg == 0 then + return "LS Inactive" + end + return msg + end + -- add client + for _, client in pairs(buf_clients) do + if client.name ~= "null-ls" and client.name ~= "copilot" then + table.insert(buf_client_names, client.name) + end + end + -- add formatter + local supported_formatters = list_registered(buf_ft) + vim.list_extend(buf_client_names, supported_formatters) + -- add linter + local supported_linters = linter_list_registered(buf_ft) + vim.list_extend(buf_client_names, supported_linters) + -- decomple + local unique_client_names = vim.fn.uniq(buf_client_names) + local msg = table.concat(unique_client_names, ", ") + return msg + end, + --icon = " ", + icon = icons.ui.Gear .. "", + padding = 1, +} +local lsp_progress = {} +local data_exists, lspprogress = pcall(require, "lsp-progress") +if data_exists then + lsp_progress = lspprogress.progress +end + +local clear_lualine = require("core.config").clear_lualine +if clear_lualine ~= nil then + if clear_lualine == 1 then + lualine.setup({ + options = { + icons_enabled = true, + theme = "auto", + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = { + "TelescopePrompt", + "packer", + "alpha", + "dashboard", + "NvimTree", + "Outline", + "DressingInput", + "toggleterm", + "lazy", + "mason", + "neo-tree", + }, + always_divide_middle = true, + }, + + sections = { + lualine_a = {}, + lualine_b = { mode, branch }, + lualine_c = { lsp_info, diagnostics, lsp_progress }, + -- lualine_c = { file_name, lsp_info }, + -- lualine_x = { "encoding", "fileformat", "filetype" }, + -- lualine_x = { diff, spaces, "encoding", filetype }, + lualine_x = { diff, spaces, filetype }, + lualine_y = { location, time }, + --[[ lualine_z = { progress }, ]] + lualine_z = {}, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + extensions = {}, + }) + else + lualine.setup({ + options = { + icons_enabled = true, + theme = "auto", + component_separators = component_separators, + section_separators = section_separators, + disabled_filetypes = { + "TelescopePrompt", + "packer", + "alpha", + "dashboard", + "NvimTree", + "Outline", + "DressingInput", + "toggleterm", + "lazy", + "mason", + "neo-tree", + }, + always_divide_middle = true, + }, + + sections = { + lualine_a = { mode }, + lualine_b = { branch }, + lualine_c = { lsp_info, diagnostics, lsp_progress }, + -- lualine_c = { file_name, lsp_info }, + -- lualine_x = { "encoding", "fileformat", "filetype" }, + -- lualine_x = { diff, spaces, "encoding", filetype }, + lualine_x = { diff, spaces, filetype }, + lualine_y = { location }, + --[[ lualine_z = { progress }, ]] + lualine_z = { time }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + extensions = {}, + }) + end +else + lualine.setup({ + options = { + icons_enabled = true, + theme = "auto", + component_separators = component_separators, + section_separators = section_separators, + disabled_filetypes = { + "TelescopePrompt", + "packer", + "alpha", + "dashboard", + "NvimTree", + "Outline", + "DressingInput", + "toggleterm", + "lazy", + "mason", + "neo-tree", + }, + always_divide_middle = true, + }, + + sections = { + lualine_a = { mode }, + lualine_b = { branch }, + lualine_c = { lsp_info, diagnostics, lsp_progress }, + -- lualine_c = { file_name, lsp_info }, + -- lualine_x = { "encoding", "fileformat", "filetype" }, + -- lualine_x = { diff, spaces, "encoding", filetype }, + lualine_x = { diff, spaces, filetype }, + lualine_y = { location }, + --[[ lualine_z = { progress }, ]] + lualine_z = { time }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + extensions = {}, + }) +end + +-- lualine.setup({ +-- options = { +-- icons_enabled = true, +-- theme = "auto", +-- component_separators = component_separators, +-- section_separators = section_separators, +-- disabled_filetypes = { +-- "TelescopePrompt", +-- "packer", +-- "alpha", +-- "dashboard", +-- "NvimTree", +-- "Outline", +-- "DressingInput", +-- "toggleterm", +-- "lazy", +-- "mason", +-- "neo-tree", +-- }, +-- always_divide_middle = true, +-- }, +-- +-- sections = { +-- lualine_a = { mode }, +-- lualine_b = { branch }, +-- lualine_c = { lsp_info, diagnostics, lsp_progress }, +-- -- lualine_c = { file_name, lsp_info }, +-- -- lualine_x = { "encoding", "fileformat", "filetype" }, +-- -- lualine_x = { diff, spaces, "encoding", filetype }, +-- lualine_x = { diff, spaces, filetype }, +-- lualine_y = { location }, +-- --[[ lualine_z = { progress }, ]] +-- lualine_z = { time }, +-- }, +-- inactive_sections = { +-- lualine_a = {}, +-- lualine_b = {}, +-- lualine_c = { "filename" }, +-- lualine_x = { "location" }, +-- lualine_y = {}, +-- lualine_z = {}, +-- }, +-- tabline = {}, +-- extensions = {}, +-- }) diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua index 24b4ce9..ec0c909 100644 --- a/lua/user/nvim-tree.lua +++ b/lua/user/nvim-tree.lua @@ -207,8 +207,8 @@ nvim_tree.setup({ }, }, notify = { - -- threshold = vim.log.levels.INFO, - threshold = vim.log.levels.ERROR, + threshold = vim.log.levels.INFO, + -- threshold = vim.log.levels.ERROR, }, log = { enable = false, diff --git a/lua/user/webdevicons.lua b/lua/user/webdevicons.lua index 1dd8bd4..afdf7e9 100644 --- a/lua/user/webdevicons.lua +++ b/lua/user/webdevicons.lua @@ -8,502 +8,7 @@ if not material_icon_ok then return end -local prettier_icon = "" -material_icon.setup({ - override = { - ["mjs"] = { - icon = "󰌞", - color = "#f2c55c", - cterm_color = "220", - name = "Mjs", - }, - ["js"] = { - icon = "󰌞", - color = "#f2c55c", - cterm_color = "220", - name = "javascript", - }, - ["ts"] = { - icon = "󰛦", - color = "#548af7", - cterm_color = "220", - name = "ts", - }, - ["jsx"] = { - icon = "", - color = "#61dafb", - cterm_color = "220", - name = "jsx", - }, - ["tsx"] = { - icon = "", - color = "#3699ff", - cterm_color = "220", - name = "Tsx", - }, - ["svg"] = { - icon = "󰜡", - color = "#FDB03A", - cterm_color = "220", - name = "svg", - }, - ["prisma"] = { - icon = "", - color = "#0FBFCF", - cterm_color = "220", - name = "prisma", - }, - ["json"] = { - icon = "", - color = "#f16421", - cterm_color = "220", - name = "json", - }, - ["map"] = { - icon = "", - color = "#748e54", - cterm_color = "220", - name = "map", - }, - ["svelte"] = { - icon = "", - color = "#ef510b", - cterm_color = "220", - name = "svelte", - }, - ["yaml"] = { - icon = "󰰳", - color = "#ef510b", - cterm_color = "220", - name = "yaml", - }, - ["vsix"] = { - icon = "", - color = "#30A2FF", - cterm_color = "220", - name = "vsix", - }, - ["class"] = { - icon = "󰅶", - color = "#1e88e5", - cterm_color = "220", - name = "JavaClass", - }, - ["java"] = { - icon = "󰅶", - color = "#ef510b", - cterm_color = "220", - name = "JavaFile", - }, - ["gradle"] = { - icon = "", - color = "#9C9C9C", - cterm_color = "220", - name = "GradleFile", - }, - ["mod"] = { - icon = "󰟓", - color = "#C5362B", - cterm_color = "220", - name = "gomod", - }, - ["blade.php"] = { - icon = "󰫐", - color = "#ef510b", - cterm_color = "220", - name = "bladephp", - }, - ["7z"] = { - icon = "", - color = "#9C9C9C", - cterm_color = "220", - name = "7z", - }, - ["zip"] = { - icon = "", - color = "#9C9C9C", - cterm_color = "220", - name = "zip", - }, - ["rar"] = { - icon = "", - color = "#9C9C9C", - cterm_color = "220", - name = "rar", - }, - ["cfm"] = { - icon = "", - color = "#507F89", - cterm_color = "220", - name = "cfm", - }, - ["cfc"] = { - icon = "", - color = "#507F89", - cterm_color = "220", - name = "cfc", - }, - ["png"] = { - icon = "󰋩", - color = "#3574f0", - cterm_color = "220", - name = "Png", - }, - ["jpg"] = { - icon = "󰋩", - color = "#3574f0", - cterm_color = "220", - name = "jpg", - }, - ["jpeg"] = { - icon = "󰥶", - color = "#88C057", - cterm_color = "220", - name = "jpeg", - }, - ["csv"] = { - icon = "󰈚", - color = "#57965c", - cterm_color = "220", - name = "csv", - }, - ["sql"] = { - icon = "󰆼", - color = "#b589ec", - cterm_color = "220", - name = "sqlfile", - }, - ["php"] = { - icon = "󰌟", - color = "#b589ec", - cterm_color = "220", - name = "phpfile", - }, - ["mp4"] = { - icon = "󰈫", - color = "#FC6411", - cterm_color = "220", - name = "mp4file", - }, - ["md"] = { - icon = "", - color = "#42a5f5", - cterm_color = "220", - name = "markdown", - }, - ["sh"] = { - icon = "", - color = "#ef510b", - cterm_color = "220", - name = "README_file", - }, - ["pdf"] = { - icon = "", - color = "#ef510b", - cterm_color = "220", - name = "pdffile", - }, - ["xlsx"] = { - icon = "󱀭", - color = "#349C42", - cterm_color = "220", - name = "xlsxfile", - }, - ["xls"] = { - icon = "󱀭", - color = "#349C42", - cterm_color = "220", - name = "xlsfile", - }, - -- ["go"] = { - -- icon = "󰟓", - -- color = "#0FBFCF", - -- cterm_color = "220", - -- name = "go", - -- }, - }, - color_icons = true, - default = true, -}) - web_devicons.setup({ override = material_icon.get_icons(), - override_by_filename = { - ["artisan"] = { - icon = "󰫐", - color = "#ef510b", - cterm_color = "240", - name = "artisan", - }, - ["vite.config.ts"] = { - icon = "󰉁", - color = "#ffab00", - cterm_color = "240", - name = "viteconfigts", - }, - ["vite.config.js"] = { - icon = "󰉁", - color = "#ffab00", - cterm_color = "240", - name = "viteconfigjs", - }, - [".releaserc"] = { - icon = "󰚧", - color = "#9C9C9C", - cterm_color = "240", - name = "releaserc", - }, - [".profile"] = { - icon = "󰙄", - color = "#9C9C9C", - cterm_color = "240", - name = "profiledata", - }, - [".eslint_d"] = { - icon = "󰱺", - color = "#4930bd", - cterm_color = "240", - name = "eslintd", - }, - [".eslintrc.cjs"] = { - icon = "󰱺", - color = "#4930bd", - cterm_color = "240", - name = "eslintrccjs", - }, - [".htaccess"] = { - icon = "󰛓", - color = "#C63C17", - cterm_color = "240", - name = "htaccess", - }, - ["pom.xml"] = { - icon = "󰛓", - color = "#C63C17", - cterm_color = "240", - name = "pomxml", - }, - [".huskyrc"] = { - icon = "󰩃", - color = "#ffffff", - cterm_color = "240", - name = "huskyrc", - }, - [".prettierrc"] = { - icon = prettier_icon, - color = "#ea5e5e", - cterm_color = "240", - name = "prettierrc", - }, - [".prettierrc.json"] = { - icon = prettier_icon, - color = "#ea5e5e", - cterm_color = "240", - name = "prettierrcjson", - }, - [".prettierd"] = { - icon = prettier_icon, - color = "#ea5e5e", - cterm_color = "240", - name = "prettierd", - }, - [".vscodeignore"] = { - icon = "", - color = "#30A2FF", - cterm_color = "240", - name = "vscodeignore", - }, - [".vsixmanifest"] = { - icon = "", - color = "#30A2FF", - cterm_color = "240", - name = "vsixmanifest", - }, - [".prettierignore"] = { - icon = prettier_icon, - color = "#ea5e5e", - cterm_color = "240", - name = "prettierignore", - }, - [".sequelizerc"] = { - icon = "󱙌", - color = "#397883", - cterm_color = "220", - name = "sequelizerc", - }, - ["pre-commit"] = { - icon = "", - color = "#75e4b3", - cterm_color = "240", - name = "pre", - }, - ["yarn.lock"] = { - icon = "", - color = "#ea5e5e", - cterm_color = "240", - name = "yarnlock", - }, - ["yarn-error.log"] = { - icon = "", - color = "#3d85c6", - cterm_color = "240", - name = "yarnerror", - }, - [".eslintrc.json"] = { - icon = "󰱺", - color = "#4746a8", - cterm_color = "240", - name = "eslintrc", - }, - [".eslintrc.js"] = { - icon = "󰱺", - color = "#4746a8", - cterm_color = "240", - name = "eslintrcjs", - }, - [".eslintignore"] = { - icon = "󰱺", - color = "#4746a8", - cterm_color = "240", - name = "eslintignore", - }, - ["jest.config.js"] = { - icon = "󰚐", - color = "#e37575", - cterm_color = "220", - name = "jestconfig", - }, - ["cname"] = { - icon = "󰖟", - color = "#e37575", - cterm_color = "220", - name = "cname", - }, - [".nvmrc"] = { - icon = "", - color = "#E8274B", - cterm_color = "220", - name = "nvmrc", - }, - [".yarnrc"] = { - icon = "", - color = "#3d85c6", - cterm_color = "240", - name = "yarnrc", - }, - [".git-blame-ignore-revs"] = { - icon = "󰊢", - color = "#F14C28", - cterm_color = "220", - name = "gitblameignorerevs", - }, - [".gitmodules"] = { - icon = "󰊢", - color = "#0c343d", - cterm_color = "220", - name = "gitmodules", - }, - [".mailmap"] = { - icon = "󰇮", - color = "#a0d0d0", - cterm_color = "220", - name = "mailmap", - }, - [".vscode-test.js"] = { - icon = "󰨞", - color = "#206ba3", - cterm_color = "220", - name = "vscodetest", - }, - [".mention-bot"] = { - icon = "󰚩", - color = "#ffffff", - cterm_color = "220", - name = "mentionbot", - }, - [".project"] = { - icon = "󰈚", - color = "#5881b1", - cterm_color = "220", - name = "project", - }, - ["gradlew"] = { - icon = "", - color = "#9C9C9C", - cterm_color = "220", - name = "gradlewFile", - }, - [".classpath"] = { - icon = "󰅶", - color = "#9C9C9C", - 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", - }, - ["nodemon.json"] = { - icon = "󰇴", - color = "#76d04b", - cterm_color = "220", - name = "nodemonjson", - }, - ["webpack.config.js"] = { - icon = "󰜫", - color = "#8ED6FB", - cterm_color = "220", - name = "webpackconfigjs", - }, - ["package.json"] = { - icon = "󰎙", - color = "#8ED6FB", - cterm_color = "220", - name = "packagejson", - }, - ["package-lock.json"] = { - icon = "󰎙", - color = "#cc0000", - cterm_color = "220", - name = "packagelockjson", - }, - [".gitignore"] = { - icon = "󰊢", - color = "#8ED6FB", - cterm_color = "220", - name = "gitignore", - }, - ["tsconfig.json"] = { - icon = "󰛦", - color = "#519aba", - cterm_color = "74", - name = "TSConfig", - }, - ["jsconfig.json"] = { - icon = "󰌞", - color = "#f2c55c", - cterm_color = "220", - name = "JSConfig", - }, - [".gitlab-ci.yml"] = { - icon = "", - color = "#F14C28", - cterm_color = "220", - name = "gitlabciyaml", - }, - [".env_example"] = { - icon = "", - color = "#faf743", - cterm_color = "227", - name = "Envexample", - }, - }, + override_by_filename = {}, }) diff --git a/lua/user/webdevicons_backup.lua b/lua/user/webdevicons_backup.lua new file mode 100644 index 0000000..acdd2ec --- /dev/null +++ b/lua/user/webdevicons_backup.lua @@ -0,0 +1,1642 @@ +local web_devicons_ok, web_devicons = pcall(require, "nvim-web-devicons") +if not web_devicons_ok then + return +end + +local material_icon_ok, material_icon = pcall(require, "nvim-material-icon") +if not material_icon_ok then + return +end + +material_icon.setup({ + override = { + ["mjs"] = { + icon = "󰌞", + color = "#f2c55c", + cterm_color = "220", + name = "Mjs", + }, + ["js"] = { + icon = "󰌞", + color = "#f2c55c", + cterm_color = "220", + name = "javascript", + }, + ["ts"] = { + icon = "󰛦", + color = "#548af7", + cterm_color = "220", + name = "ts", + }, + ["jsx"] = { + icon = "", + color = "#61dafb", + cterm_color = "220", + name = "jsx", + }, + ["tsx"] = { + icon = "", + color = "#3699ff", + cterm_color = "220", + name = "Tsx", + }, + ["svg"] = { + icon = "󰜡", + color = "#FDB03A", + cterm_color = "220", + name = "svg", + }, + ["prisma"] = { + icon = "", + color = "#0FBFCF", + cterm_color = "220", + name = "prisma", + }, + ["json"] = { + icon = "", + color = "#f16421", + cterm_color = "220", + name = "json", + }, + ["map"] = { + icon = "", + color = "#748e54", + cterm_color = "220", + name = "map", + }, + ["svelte"] = { + icon = "", + color = "#ef510b", + cterm_color = "220", + name = "svelte", + }, + ["yaml"] = { + icon = "󰰳", + color = "#ef510b", + cterm_color = "220", + name = "yaml", + }, + ["vsix"] = { + icon = "", + color = "#30A2FF", + cterm_color = "220", + name = "vsix", + }, + ["class"] = { + icon = "󰅶", + color = "#1e88e5", + cterm_color = "220", + name = "JavaClass", + }, + ["java"] = { + icon = "󰅶", + color = "#ef510b", + cterm_color = "220", + name = "JavaFile", + }, + ["gradle"] = { + icon = "", + color = "#9C9C9C", + cterm_color = "220", + name = "GradleFile", + }, + ["mod"] = { + icon = "󰟓", + color = "#C5362B", + cterm_color = "220", + name = "gomod", + }, + ["blade.php"] = { + icon = "󰫐", + color = "#ef510b", + cterm_color = "220", + name = "bladephp", + }, + ["7z"] = { + icon = "", + color = "#9C9C9C", + cterm_color = "220", + name = "7z", + }, + ["rar"] = { + icon = "", + color = "#9C9C9C", + cterm_color = "220", + name = "rar", + }, + ["cfm"] = { + icon = "", + color = "#507F89", + cterm_color = "220", + name = "cfm", + }, + ["cfc"] = { + icon = "", + color = "#507F89", + cterm_color = "220", + name = "cfc", + }, + ["png"] = { + icon = "󰋩", + color = "#3574f0", + cterm_color = "220", + name = "Png", + }, + ["jpg"] = { + icon = "󰋩", + color = "#3574f0", + cterm_color = "220", + name = "jpg", + }, + ["jpeg"] = { + icon = "󰥶", + color = "#88C057", + cterm_color = "220", + name = "jpeg", + }, + ["csv"] = { + icon = "󰈚", + color = "#57965c", + cterm_color = "220", + name = "csv", + }, + ["sql"] = { + icon = "󰆼", + color = "#b589ec", + cterm_color = "220", + name = "sqlfile", + }, + ["php"] = { + icon = "󰌟", + color = "#b589ec", + cterm_color = "220", + name = "phpfile", + }, + ["mp4"] = { + icon = "󰈫", + color = "#FC6411", + cterm_color = "220", + name = "mp4file", + }, + ["md"] = { + icon = "", + color = "#42a5f5", + cterm_color = "220", + name = "Md", + }, + ["sh"] = { + icon = "", + color = "#ef510b", + cterm_color = "220", + name = "README_file", + }, + ["pdf"] = { + icon = "", + color = "#ef510b", + cterm_color = "220", + name = "pdffile", + }, + ["xlsx"] = { + icon = "󱀭", + color = "#349C42", + cterm_color = "220", + name = "xlsxfile", + }, + ["xls"] = { + icon = "󱀭", + color = "#349C42", + cterm_color = "220", + name = "xlsfile", + }, + ["py"] = { + icon = "󰌠", + color = "#387EB8", + cterm_color = "220", + name = "pythonfile", + }, + ["vue"] = { + icon = "󰡄", + color = "#4dba87", + cterm_color = "220", + name = "vuefile", + }, + ["xml"] = { + icon = "󰗀", + color = "#f1662a", + cterm_color = "220", + name = "xmlfile", + }, + ["yml"] = { + icon = "󰰳", + color = "#fbc02d", + cterm_color = "220", + name = "Ymlfile", + }, + ["txt"] = { + icon = "", + color = "#89e051", + cterm_color = "220", + name = "txtfile", + }, + ["toml"] = { + icon = "", + color = "#9c4221", + cterm_color = "124", + name = "Toml", + }, + -- ["go"] = { + -- icon = "󰟓", + -- color = "#0FBFCF", + -- cterm_color = "220", + -- name = "go", + -- }, + [".babelrc"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "Babelrc", + }, + [".bash_profile"] = { + icon = "", + color = "#89e051", + cterm_color = "113", + name = "BashProfile", + }, + [".bashrc"] = { + icon = "", + color = "#89e051", + cterm_color = "113", + name = "Bashrc", + }, + [".DS_Store"] = { + icon = "", + color = "#41535b", + cterm_color = "239", + name = "DsStore", + }, + [".gitconfig"] = { + icon = "", + color = "#41535b", + cterm_color = "239", + name = "GitConfig", + }, + [".gitlab-ci.yml"] = { + icon = "", + color = "#e24329", + cterm_color = "166", + name = "GitlabCI", + }, + [".gvimrc"] = { + icon = "", + color = "#019833", + cterm_color = "29", + name = "Gvimrc", + }, + [".npmignore"] = { + icon = "", + color = "#E8274B", + cterm_color = "161", + name = "NPMIgnore", + }, + [".npmrc"] = { + icon = "", + color = "#E8274B", + cterm_color = "161", + name = "NPMrc", + }, + [".settings.json"] = { + icon = "", + color = "#854CC7", + cterm_color = "98", + name = "SettingsJson", + }, + [".vimrc"] = { + icon = "", + color = "#019833", + cterm_color = "29", + name = "Vimrc", + }, + [".zprofile"] = { + icon = "", + color = "#89e051", + cterm_color = "113", + name = "Zshprofile", + }, + [".zshenv"] = { + icon = "", + color = "#89e051", + cterm_color = "113", + name = "Zshenv", + }, + [".zshrc"] = { + icon = "", + color = "#89e051", + cterm_color = "113", + name = "Zshrc", + }, + ["Brewfile"] = { + icon = "", + color = "#701516", + cterm_color = "1", + name = "Brewfile", + }, + ["CMakeLists.txt"] = { + icon = "", + color = "#6d8086", + cterm_color = "66", + name = "CMakeLists", + }, + ["COPYING"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "License", + }, + ["COPYING.LESSER"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "License", + }, + ["Dockerfile"] = { + icon = "", + color = "#0087c9", + cterm_color = "32", + name = "Dockerfile", + }, + ["Gemfile$"] = { + icon = "", + color = "#701516", + cterm_color = "1", + name = "Gemfile", + }, + ["Rmd"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Rmd", + }, + ["Vagrantfile$"] = { + icon = "", + color = "#1563FF", + cterm_color = "27", + name = "Vagrantfile", + }, + ["_gvimrc"] = { + icon = "", + color = "#019833", + cterm_color = "29", + name = "Gvimrc", + }, + ["_vimrc"] = { + icon = "", + color = "#019833", + cterm_color = "29", + name = "Vimrc", + }, + ["ai"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "Ai", + }, + ["awk"] = { + icon = "", + color = "#4d5a5e", + cterm_color = "240", + name = "Awk", + }, + ["bash"] = { + icon = "", + color = "#89e051", + cterm_color = "113", + name = "Bash", + }, + ["bat"] = { + icon = "", + color = "#C1F12E", + cterm_color = "154", + name = "Bat", + }, + ["c"] = { + icon = "", + color = "#599eff", + cterm_color = "75", + name = "C", + }, + ["c++"] = { + icon = "", + color = "#f34b7d", + cterm_color = "204", + name = "CPlusPlus", + }, + ["cbl"] = { + icon = "⚙", + color = "#005ca5", + cterm_color = "25", + name = "Cobol", + }, + ["cc"] = { + icon = "", + color = "#f34b7d", + cterm_color = "204", + name = "CPlusPlus", + }, + ["cfg"] = { + icon = "", + color = "#ECECEC", + cterm_color = "255", + name = "Configuration", + }, + ["clj"] = { + icon = "", + color = "#8dc149", + cterm_color = "107", + name = "Clojure", + }, + ["cljc"] = { + icon = "", + color = "#8dc149", + cterm_color = "107", + name = "ClojureC", + }, + ["cljs"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "ClojureJS", + }, + ["cljd"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "ClojureDart", + }, + ["cmake"] = { + icon = "", + color = "#6d8086", + cterm_color = "66", + name = "CMake", + }, + ["cob"] = { + icon = "⚙", + color = "#005ca5", + cterm_color = "25", + name = "Cobol", + }, + ["cobol"] = { + icon = "⚙", + color = "#005ca5", + cterm_color = "25", + name = "Cobol", + }, + ["coffee"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "Coffee", + }, + ["conf"] = { + icon = "", + color = "#6d8086", + cterm_color = "66", + name = "Conf", + }, + ["config.ru"] = { + icon = "", + color = "#701516", + cterm_color = "1", + name = "ConfigRu", + }, + ["cp"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Cp", + }, + ["cpp"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Cpp", + }, + ["cpy"] = { + icon = "⚙", + color = "#005ca5", + cterm_color = "25", + name = "Cobol", + }, + ["cr"] = { + icon = "", + color = "#000000", + cterm_color = "16", + name = "Crystal", + }, + ["csh"] = { + icon = "", + color = "#4d5a5e", + cterm_color = "240", + name = "Csh", + }, + ["cson"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "Cson", + }, + ["css"] = { + icon = "", + color = "#42a5f5", + cterm_color = "75", + name = "Css", + }, + ["cxx"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Cxx", + }, + ["d"] = { + icon = "", + color = "#427819", + cterm_color = "64", + name = "D", + }, + ["dart"] = { + icon = "", + color = "#03589C", + cterm_color = "25", + name = "Dart", + }, + ["db"] = { + icon = "", + color = "#dad8d8", + cterm_color = "253", + name = "Db", + }, + ["desktop"] = { + icon = "", + color = "#563d7c", + cterm_color = "60", + name = "DesktopEntry", + }, + ["diff"] = { + icon = "", + color = "#41535b", + cterm_color = "239", + name = "Diff", + }, + ["dockerfile"] = { + icon = "", + color = "#0087c9", + cterm_color = "32", + name = "Dockerfile", + }, + ["drl"] = { + icon = "", + color = "#ffafaf", + cterm_color = "217", + name = "Drools", + }, + ["dropbox"] = { + icon = "", + color = "#0061FE", + cterm_color = "27", + name = "Dropbox", + }, + ["dump"] = { + icon = "", + color = "#dad8d8", + cterm_color = "253", + name = "Dump", + }, + ["edn"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Edn", + }, + ["eex"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Eex", + }, + ["ejs"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "Ejs", + }, + ["elm"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Elm", + }, + ["epp"] = { + icon = "", + color = "#FFA61A", + cterm_color = "214", + name = "Epp", + }, + ["erb"] = { + icon = "", + color = "#701516", + cterm_color = "1", + name = "Erb", + }, + ["erl"] = { + icon = "", + color = "#B83998", + cterm_color = "132", + name = "Erl", + }, + ["ex"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Ex", + }, + ["exs"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Exs", + }, + ["f#"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Fsharp", + }, + ["favicon.ico"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "Favicon", + }, + ["fnl"] = { + icon = "", + color = "#fff3d7", + cterm_color = "230", + name = "Fennel", + }, + ["fs"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Fs", + }, + ["fsi"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Fsi", + }, + ["fsscript"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Fsscript", + }, + ["fsx"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Fsx", + }, + ["gd"] = { + icon = "", + color = "#6d8086", + cterm_color = "66", + name = "GDScript", + }, + ["gemspec"] = { + icon = "", + color = "#701516", + cterm_color = "1", + name = "Gemspec", + }, + ["gif"] = { + icon = "", + color = "#26a69a", + cterm_color = "36", + name = "Gif", + }, + ["glb"] = { + icon = "", + color = "#FFB13B", + cterm_color = "215", + name = "BinaryGLTF", + }, + ["go"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Go", + }, + ["godot"] = { + icon = "", + color = "#6d8086", + cterm_color = "66", + name = "GodotProject", + }, + ["graphql"] = { + icon = "", + color = "#e535ab", + cterm_color = "169", + name = "GraphQL", + }, + ["gruntfile"] = { + icon = "", + color = "#e37933", + cterm_color = "173", + name = "Gruntfile", + }, + ["gulpfile"] = { + icon = "", + color = "#cc3e44", + cterm_color = "167", + name = "Gulpfile", + }, + ["h"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "H", + }, + ["haml"] = { + icon = "", + color = "#eaeae1", + cterm_color = "254", + name = "Haml", + }, + ["hbs"] = { + icon = "", + color = "#f0772b", + cterm_color = "208", + name = "Hbs", + }, + ["heex"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Heex", + }, + ["hh"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Hh", + }, + ["hpp"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Hpp", + }, + ["hrl"] = { + icon = "", + color = "#B83998", + cterm_color = "132", + name = "Hrl", + }, + ["hs"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Hs", + }, + ["htm"] = { + icon = "", + color = "#e34c26", + cterm_color = "166", + name = "Htm", + }, + ["html"] = { + icon = "", + color = "#e44d26", + cterm_color = "166", + name = "Html", + }, + ["hxx"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Hxx", + }, + ["ico"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "Ico", + }, + ["import"] = { + icon = "", + color = "#ECECEC", + cterm_color = "255", + name = "ImportConfiguration", + }, + ["ini"] = { + icon = "", + color = "#6d8086", + cterm_color = "66", + name = "Ini", + }, + ["jl"] = { + icon = "", + color = "#a270ba", + cterm_color = "133", + name = "Jl", + }, + ["json5"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "Json5", + }, + ["ksh"] = { + icon = "", + color = "#4d5a5e", + cterm_color = "240", + name = "Ksh", + }, + ["kt"] = { + icon = "", + color = "#F88A02", + cterm_color = "208", + name = "Kotlin", + }, + ["kts"] = { + icon = "", + color = "#F88A02", + cterm_color = "208", + name = "KotlinScript", + }, + ["leex"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Leex", + }, + ["less"] = { + icon = "", + color = "#563d7c", + cterm_color = "60", + name = "Less", + }, + ["lhs"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Lhs", + }, + ["lua"] = { + icon = "", + color = "#51a0cf", + cterm_color = "74", + name = "Lua", + }, + ["luau"] = { + icon = "", + color = "#51a0cf", + cterm_color = "74", + name = "Luau", + }, + ["makefile"] = { + icon = "", + color = "#6d8086", + cterm_color = "66", + name = "Makefile", + }, + ["markdown"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Markdown", + }, + ["mdx"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Mdx", + }, + ["mix.lock"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "MixLock", + }, + ["ml"] = { + icon = "λ", + color = "#e37933", + cterm_color = "173", + name = "Ml", + }, + ["mli"] = { + icon = "λ", + color = "#e37933", + cterm_color = "173", + name = "Mli", + }, + ["mo"] = { + icon = "∞", + color = "#9772FB", + cterm_color = "99", + name = "Motoko", + }, + ["mustache"] = { + icon = "", + color = "#e37933", + cterm_color = "173", + name = "Mustache", + }, + ["nim"] = { + icon = "", + color = "#f3d400", + cterm_color = "220", + name = "Nim", + }, + ["nix"] = { + icon = "", + color = "#7ebae4", + cterm_color = "110", + name = "Nix", + }, + ["otf"] = { + icon = "", + color = "#ECECEC", + cterm_color = "255", + name = "OpenTypeFont", + }, + ["pck"] = { + icon = "", + color = "#6d8086", + cterm_color = "66", + name = "PackedResource", + }, + ["pp"] = { + icon = "", + color = "#FFA61A", + cterm_color = "214", + name = "Pp", + }, + ["Procfile"] = { + icon = "", + color = "#a074c4", + cterm_color = "140", + name = "Procfile", + }, + ["ps1"] = { + icon = "", + color = "#4d5a5e", + cterm_color = "240", + name = "PromptPs1", + }, + ["psb"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Psb", + }, + ["psd"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Psd", + }, + ["query"] = { + icon = "", + color = "#90a850", + cterm_color = "107", + name = "Query", + }, + ["rake"] = { + icon = "", + color = "#701516", + cterm_color = "1", + name = "Rake", + }, + ["rakefile"] = { + icon = "", + color = "#701516", + cterm_color = "1", + name = "Rakefile", + }, + ["rb"] = { + icon = "", + color = "#701516", + cterm_color = "1", + name = "Rb", + }, + ["rlib"] = { + icon = "", + color = "#dea584", + cterm_color = "180", + name = "Rlib", + }, + ["rmd"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Rmd", + }, + ["rs"] = { + icon = "", + color = "#dea584", + cterm_color = "180", + name = "Rs", + }, + ["rss"] = { + icon = "", + color = "#FB9D3B", + cterm_color = "215", + name = "Rss", + }, + ["sass"] = { + icon = "", + color = "#f55385", + cterm_color = "204", + name = "Sass", + }, + ["sbt"] = { + icon = "", + color = "#cc3e44", + cterm_color = "167", + name = "sbt", + }, + ["scala"] = { + icon = "", + color = "#f44336", + cterm_color = "203", + name = "Scala", + }, + ["scm"] = { + icon = "ﬦ", + color = "#000000", + cterm_color = "16", + name = "Scheme", + }, + ["scss"] = { + icon = "", + color = "#f55385", + cterm_color = "204", + name = "Scss", + }, + ["sig"] = { + icon = "λ", + color = "#e37933", + cterm_color = "173", + name = "Sig", + }, + ["slim"] = { + icon = "", + color = "#e34c26", + cterm_color = "166", + name = "Slim", + }, + ["sln"] = { + icon = "", + color = "#854CC7", + cterm_color = "98", + name = "Sln", + }, + ["sml"] = { + icon = "λ", + color = "#e37933", + cterm_color = "173", + name = "Sml", + }, + ["sqlite"] = { + icon = "", + color = "#dad8d8", + cterm_color = "253", + name = "Sql", + }, + ["sqlite3"] = { + icon = "", + color = "#dad8d8", + cterm_color = "253", + name = "Sql", + }, + ["styl"] = { + icon = "", + color = "#8dc149", + cterm_color = "107", + name = "Styl", + }, + ["sublime"] = { + icon = "", + color = "#e37933", + cterm_color = "173", + name = "Suo", + }, + ["suo"] = { + icon = "", + color = "#854CC7", + cterm_color = "98", + name = "Suo", + }, + ["t"] = { + icon = "", + color = "#519aba", + cterm_color = "67", + name = "Tor", + }, + ["terminal"] = { + icon = "", + color = "#31B53E", + cterm_color = "71", + name = "Terminal", + }, + ["tres"] = { + icon = "", + color = "#cbcb41", + cterm_color = "185", + name = "TextResource", + }, + ["twig"] = { + icon = "", + color = "#8dc149", + cterm_color = "107", + name = "Twig", + }, + ["vim"] = { + icon = "", + color = "#019833", + cterm_color = "29", + name = "Vim", + }, + ["webmanifest"] = { + icon = "", + color = "#f1e05a", + cterm_color = "221", + name = "Webmanifest", + }, + ["xcplayground"] = { + icon = "", + color = "#e37933", + cterm_color = "173", + name = "XcPlayground", + }, + ["zig"] = { + icon = "", + color = "#f69a1b", + cterm_color = "208", + name = "Zig", + }, + ["zsh"] = { + icon = "", + color = "#89e051", + cterm_color = "113", + name = "Zsh", + }, + [".env"] = { + icon = "", + color = "#faf743", + cterm_color = "227", + name = "Env", + }, + ["lock"] = { + icon = "", + color = "#ffd54f", + cterm_color = "221", + name = "Lock", + }, + ["log"] = { + icon = "", + color = "#ffffff", + cterm_color = "231", + name = "Log", + }, + ["zip"] = { + icon = "", + color = "#afb42b", + cterm_color = "142", + name = "Zip", + }, + ["xz"] = { + icon = "", + color = "#afb42b", + cterm_color = "142", + name = "Xz", + }, + ["test.js"] = { + icon = "", + color = "#ffca28", + cterm_color = "220", + name = "TestJavascript", + }, + ["test.jsx"] = { + icon = "", + color = "#00bcd4", + cterm_color = "38", + name = "TestJavascriptReact", + }, + ["test.ts"] = { + icon = "", + color = "#00bcd4", + cterm_color = "38", + name = "TestTypescript", + }, + ["ttf"] = { + icon = "", + color = "#f44336", + cterm_color = "203", + name = "Ttf", + }, + ["woff"] = { + icon = "", + color = "#f44336", + cterm_color = "203", + name = "WebOpenFontFormat", + }, + ["woff2"] = { + icon = "", + color = "#f44336", + cterm_color = "203", + name = "WebOpenFontFormat", + }, + ["hex"] = { + icon = "", + color = "#26a69a", + cterm_color = "36", + name = "Hex", + }, + ["bin"] = { + icon = "", + color = "#26a69a", + cterm_color = "36", + name = "Bin", + }, + ["dat"] = { + icon = "", + color = "#26a69a", + cterm_color = "36", + name = "Dat", + }, + ["abc"] = { + icon = "", + color = "#ff5722", + cterm_color = "202", + name = "Abc", + }, + ["babel.config.js"] = { + icon = "", + color = "#fdd835", + cterm_color = "221", + name = "BabelConfig", + }, + ["bf"] = { + icon = "", + color = "#ff4081", + cterm_color = "204", + name = "Bf", + }, + ["exe"] = { + icon = "", + color = "#e64a19", + cterm_color = "166", + name = "Exe", + }, + ["pptx"] = { + icon = "", + color = "#d14524", + cterm_color = "166", + name = "Pptx", + }, + ["obj"] = { + icon = "", + color = "#29b6f6", + cterm_color = "39", + name = "Obj", + }, + ["fbx"] = { + icon = "", + color = "#29b6f6", + cterm_color = "39", + name = "Fbx", + }, + ["deb"] = { + icon = "", + color = "#ff0283", + cterm_color = "198", + name = "Deb", + }, + ["rpm"] = { + icon = "", + color = "#f44336", + cterm_color = "203", + name = "Rpm", + }, + ["README.md"] = { + icon = "", + color = "#42a5f5", + cterm_color = "75", + name = "README.md", + }, + ["razor"] = { + icon = "", + color = "#42a5f5", + cterm_color = "75", + name = "razor", + }, + ["sc"] = { + icon = "", + color = "#f44336", + cterm_color = "203", + name = "sc", + }, + }, + color_icons = true, + default = true, +}) + +web_devicons.setup({ + override = material_icon.get_icons(), + override_by_filename = { + ["artisan"] = { + icon = "󰫐", + color = "#ef510b", + cterm_color = "240", + name = "artisan", + }, + ["vite.config.ts"] = { + icon = "󰉁", + color = "#ffab00", + cterm_color = "240", + name = "viteconfigts", + }, + ["vite.config.js"] = { + icon = "󰉁", + color = "#ffab00", + cterm_color = "240", + name = "viteconfigjs", + }, + [".releaserc"] = { + icon = "󰚧", + color = "#9C9C9C", + cterm_color = "240", + name = "releaserc", + }, + [".profile"] = { + icon = "󰙄", + color = "#9C9C9C", + cterm_color = "240", + name = "profiledata", + }, + [".eslint_d"] = { + icon = "󰱺", + color = "#4930bd", + cterm_color = "240", + name = "eslintd", + }, + [".eslintrc.cjs"] = { + icon = "󰱺", + color = "#4930bd", + cterm_color = "240", + name = "eslintrccjs", + }, + [".htaccess"] = { + icon = "󰛓", + color = "#C63C17", + cterm_color = "240", + name = "htaccess", + }, + ["pom.xml"] = { + icon = "󰛓", + color = "#C63C17", + cterm_color = "240", + name = "pomxml", + }, + [".huskyrc"] = { + icon = "󰩃", + color = "#ffffff", + cterm_color = "240", + name = "huskyrc", + }, + [".prettierrc"] = { + icon = "", + color = "#ea5e5e", + cterm_color = "240", + name = "prettierrc", + }, + [".prettierrc.json"] = { + icon = "", + color = "#ea5e5e", + cterm_color = "240", + name = "prettierrcjson", + }, + [".prettierd"] = { + icon = "", + color = "#ea5e5e", + cterm_color = "240", + name = "prettierd", + }, + [".vscodeignore"] = { + icon = "", + color = "#30A2FF", + cterm_color = "240", + name = "vscodeignore", + }, + [".vsixmanifest"] = { + icon = "", + color = "#30A2FF", + cterm_color = "240", + name = "vsixmanifest", + }, + [".prettierignore"] = { + icon = "", + color = "#ea5e5e", + cterm_color = "240", + name = "prettierignore", + }, + [".sequelizerc"] = { + icon = "󱙌", + color = "#397883", + cterm_color = "220", + name = "sequelizerc", + }, + ["pre-commit"] = { + icon = "", + color = "#75e4b3", + cterm_color = "240", + name = "pre", + }, + ["yarn.lock"] = { + icon = "", + color = "#ea5e5e", + cterm_color = "240", + name = "yarnlock", + }, + ["yarn-error.log"] = { + icon = "", + color = "#3d85c6", + cterm_color = "240", + name = "yarnerror", + }, + [".eslintrc.json"] = { + icon = "󰱺", + color = "#4746a8", + cterm_color = "240", + name = "eslintrc", + }, + [".eslintrc.js"] = { + icon = "󰱺", + color = "#4746a8", + cterm_color = "240", + name = "eslintrcjs", + }, + [".eslintignore"] = { + icon = "󰱺", + color = "#4746a8", + cterm_color = "240", + name = "eslintignore", + }, + ["jest.config.js"] = { + icon = "󰚐", + color = "#e37575", + cterm_color = "220", + name = "jestconfig", + }, + ["cname"] = { + icon = "󰖟", + color = "#e37575", + cterm_color = "220", + name = "cname", + }, + [".nvmrc"] = { + icon = "", + color = "#E8274B", + cterm_color = "220", + name = "nvmrc", + }, + [".yarnrc"] = { + icon = "", + color = "#3d85c6", + cterm_color = "240", + name = "yarnrc", + }, + [".git-blame-ignore-revs"] = { + icon = "󰊢", + color = "#F14C28", + cterm_color = "220", + name = "gitblameignorerevs", + }, + [".gitmodules"] = { + icon = "󰊢", + color = "#0c343d", + cterm_color = "220", + name = "gitmodules", + }, + [".mailmap"] = { + icon = "󰇮", + color = "#a0d0d0", + cterm_color = "220", + name = "mailmap", + }, + [".vscode-test.js"] = { + icon = "󰨞", + color = "#206ba3", + cterm_color = "220", + name = "vscodetest", + }, + [".mention-bot"] = { + icon = "󰚩", + color = "#ffffff", + cterm_color = "220", + name = "mentionbot", + }, + [".project"] = { + icon = "󰈚", + color = "#5881b1", + cterm_color = "220", + name = "project", + }, + ["gradlew"] = { + icon = "", + color = "#9C9C9C", + cterm_color = "220", + name = "gradlewFile", + }, + [".classpath"] = { + icon = "󰅶", + color = "#9C9C9C", + 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", + }, + ["nodemon.json"] = { + icon = "󰇴", + color = "#76d04b", + cterm_color = "220", + name = "nodemonjson", + }, + ["webpack.config.js"] = { + icon = "󰜫", + color = "#8ED6FB", + cterm_color = "220", + name = "webpackconfigjs", + }, + ["package.json"] = { + icon = "󰎙", + color = "#8ED6FB", + cterm_color = "220", + name = "packagejson", + }, + ["package-lock.json"] = { + icon = "󰎙", + color = "#cc0000", + cterm_color = "220", + name = "packagelockjson", + }, + [".gitignore"] = { + icon = "󰊢", + color = "#8ED6FB", + cterm_color = "220", + name = "gitignore", + }, + ["tsconfig.json"] = { + icon = "󰛦", + color = "#519aba", + cterm_color = "74", + name = "TSConfig", + }, + ["jsconfig.json"] = { + icon = "󰌞", + color = "#f2c55c", + cterm_color = "220", + name = "JSConfig", + }, + [".gitlab-ci.yml"] = { + icon = "", + color = "#F14C28", + cterm_color = "220", + name = "gitlabciyaml", + }, + [".env_example"] = { + icon = "", + color = "#faf743", + cterm_color = "227", + name = "Envexample", + }, + ["README.md"] = { + icon = "󰋼", + color = "#faf743", + cterm_color = "227", + name = "readmefile", + }, + }, +}) From 90050479568340518c1713f57e9678d28c56209f Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Wed, 24 Apr 2024 08:46:30 +0700 Subject: [PATCH 09/23] add: update config --- lua/core/init.lua | 2 +- lua/custom/autocmd.lua | 24 +++ lua/custom/keymaps.lua | 1 + lua/custom/plugins/lualine_onedark.lua | 4 +- lua/custom/plugins/nvim_tree.lua | 274 +++++++++++++++++++++++++ lua/custom/plugins/onedarkpro.lua | 2 +- lua/plugins/ui.lua | 2 +- 7 files changed, 304 insertions(+), 5 deletions(-) create mode 100644 lua/custom/plugins/nvim_tree.lua diff --git a/lua/core/init.lua b/lua/core/init.lua index 4efce92..c77801c 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -6,7 +6,7 @@ require("user.keymaps") -- require("user.snip") -- require("core.neovide") require("custom.autocmd") --- require("custom.keymaps") +require("custom.keymaps") -- require("user.nvim-tree") -- require("user.options") -- require("user.keymaps") diff --git a/lua/custom/autocmd.lua b/lua/custom/autocmd.lua index cb51ab3..874c696 100644 --- a/lua/custom/autocmd.lua +++ b/lua/custom/autocmd.lua @@ -47,3 +47,27 @@ vim.g.VM_Extend_hl = "DiffAdd" -- vim.g.VM_Cursor_hl = "Visual" vim.g.VM_Cursor_hl = "DiffText" vim.g.VM_Insert_hl = "DiffChange" + +-- NvimTree automatically resize the floating window when neovim's window size changes +-- local tree_api = require("nvim-tree") +-- local tree_view = require("nvim-tree.view") +-- +-- vim.api.nvim_create_augroup("NvimTreeResize", { +-- clear = true, +-- }) +-- +-- vim.api.nvim_create_autocmd({ "VimResized" }, { +-- group = "NvimTreeResize", +-- callback = function() +-- if tree_view.is_visible() then +-- tree_view.close() +-- tree_api.open() +-- end +-- end, +-- }) + +-- auto open file if creation +local api = require("nvim-tree.api") +api.events.subscribe(api.events.Event.FileCreated, function(file) + vim.cmd("edit " .. file.fname) +end) diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua index 6efddc8..8cd41d9 100644 --- a/lua/custom/keymaps.lua +++ b/lua/custom/keymaps.lua @@ -2,3 +2,4 @@ local opts = { noremap = true, silent = true } local keymap = vim.api.nvim_set_keymap keymap("n", "]h", 'lua print("Testing")', opts) +keymap("n", "F", "NvimTreeToggle", opts) diff --git a/lua/custom/plugins/lualine_onedark.lua b/lua/custom/plugins/lualine_onedark.lua index e330c37..62cdaa4 100644 --- a/lua/custom/plugins/lualine_onedark.lua +++ b/lua/custom/plugins/lualine_onedark.lua @@ -150,8 +150,8 @@ return { if data_ok then lsp_progress = lspprogress.progress end - -- stylua: ignore - local is_transparat=true + -- stylua: ignore + local is_transparat=true local colors = require("onedarkpro.helpers").get_colors("onedark") local onedark = { diff --git a/lua/custom/plugins/nvim_tree.lua b/lua/custom/plugins/nvim_tree.lua new file mode 100644 index 0000000..1123684 --- /dev/null +++ b/lua/custom/plugins/nvim_tree.lua @@ -0,0 +1,274 @@ +return { + { + "kyazdani42/nvim-tree.lua", + lazy = true, + -- event = "BufRead", + cmd = { "NvimTree", "NvimTreeOpen", "NvimTreeToggle", "NvimTreeFocus", "NvimTreeClose" }, + -- dependencies = "kyazdani42/nvim-web-devicons", + config = function() + local data_exists, treeconfig = pcall(require, "core.config") + if data_exists then + if treeconfig.loadnvimtree_lazy then + vim.g.loaded_netrw = 1 + vim.g.loaded_netrwPlugin = 1 + + -- set termguicolors to enable highlight groups + vim.opt.termguicolors = true + local status_ok, nvim_tree = pcall(require, "nvim-tree") + if not status_ok then + return + end + + local HEIGHT_RATIO = 0.8 -- You can change this + local WIDTH_RATIO = 0.5 -- You can change this too + + local icons = require("user.icons") + nvim_tree.setup({ + auto_reload_on_write = false, + disable_netrw = false, + hijack_cursor = false, + hijack_netrw = true, + hijack_unnamed_buffer_when_opening = false, + sort_by = "name", + root_dirs = {}, + prefer_startup_root = false, + sync_root_with_cwd = true, + reload_on_bufenter = false, + respect_buf_cwd = false, + on_attach = "default", + select_prompts = false, + view = { + adaptive_size = false, + centralize_selection = true, + -- width = 30, + side = "left", + preserve_window_proportions = false, + number = false, + relativenumber = false, + signcolumn = "yes", + -- float = { + -- enable = true, + -- quit_on_focus_loss = true, + -- open_win_config = { + -- relative = "editor", + -- border = "rounded", + -- width = 30, + -- height = 30, + -- row = 1, + -- col = 1, + -- }, + -- }, + float = { + enable = true, + open_win_config = function() + local screen_w = vim.opt.columns:get() + local screen_h = vim.opt.lines:get() - vim.opt.cmdheight:get() + local window_w = screen_w * WIDTH_RATIO + local window_h = screen_h * HEIGHT_RATIO + local window_w_int = math.floor(window_w) + local window_h_int = math.floor(window_h) + local center_x = (screen_w - window_w) / 2 + local center_y = ((vim.opt.lines:get() - window_h) / 2) - vim.opt.cmdheight:get() + return { + border = "rounded", + relative = "editor", + row = center_y, + col = center_x, + width = window_w_int, + height = window_h_int, + } + end, + }, + width = function() + return math.floor(vim.opt.columns:get() * WIDTH_RATIO) + end, + }, + renderer = { + add_trailing = false, + group_empty = false, + highlight_git = true, + full_name = false, + highlight_opened_files = "none", + root_folder_label = ":t", + -- root_folder_label = false, + indent_width = 2, + indent_markers = { + enable = true, + inline_arrows = true, + icons = { + corner = "└", + edge = "│", + item = "│", + none = " ", + }, + }, + icons = { + webdev_colors = true, + git_placement = "before", + padding = " ", + symlink_arrow = " ➛ ", + show = { + file = true, + folder = true, + folder_arrow = true, + git = true, + }, + glyphs = { + default = icons.ui.Text, + symlink = icons.ui.FileSymlink, + bookmark = icons.ui.BookMark, + folder = { + -- arrow_closed = icons.ui.TriangleShortArrowRight, + arrow_closed = icons.ui.ChevronShortRight, + -- arrow_open = icons.ui.TriangleShortArrowDown, + arrow_open = icons.ui.ChevronShortDown, + default = icons.ui.Folder, + open = icons.ui.FolderOpen, + empty = icons.ui.EmptyFolder, + empty_open = icons.ui.EmptyFolderOpen, + symlink = icons.ui.FolderSymlink, + symlink_open = icons.ui.FolderOpen, + }, + git = { + unstaged = icons.git.FileUnstaged, + staged = icons.git.FileStaged, + unmerged = icons.git.FileUnmerged, + renamed = icons.git.FileRenamed, + untracked = icons.git.FileUntracked, + deleted = icons.git.FileDeleted, + ignored = icons.git.FileIgnored, + }, + }, + }, + special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" }, + symlink_destination = true, + }, + hijack_directories = { + enable = false, + auto_open = true, + }, + update_focused_file = { + enable = true, + debounce_delay = 15, + update_root = true, + ignore_list = {}, + }, + diagnostics = { + enable = true, + show_on_dirs = false, + show_on_open_dirs = true, + debounce_delay = 50, + severity = { + min = vim.diagnostic.severity.HINT, + max = vim.diagnostic.severity.ERROR, + }, + icons = { + hint = icons.diagnostics.BoldHint, + info = icons.diagnostics.BoldInformation, + warning = icons.diagnostics.BoldWarning, + error = icons.diagnostics.BoldError, + }, + }, + filters = { + dotfiles = false, + git_clean = false, + no_buffer = false, + custom = { "node_modules", "\\.cache", "\\.git" }, + exclude = { + ".gitignore", + ".prettierignore", + }, + }, + filesystem_watchers = { + enable = true, + debounce_delay = 50, + ignore_dirs = {}, + }, + git = { + enable = true, + ignore = false, + show_on_dirs = true, + show_on_open_dirs = true, + disable_for_dirs = {}, + timeout = 400, + }, + actions = { + use_system_clipboard = true, + change_dir = { + enable = true, + global = false, + restrict_above_cwd = false, + }, + expand_all = { + max_folder_discovery = 300, + exclude = {}, + }, + file_popup = { + open_win_config = { + col = 1, + row = 1, + relative = "cursor", + border = "shadow", + style = "minimal", + }, + }, + open_file = { + quit_on_open = false, + resize_window = false, + window_picker = { + enable = true, + picker = "default", + chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + exclude = { + filetype = { "notify", "lazy", "qf", "diff", "fugitive", "fugitiveblame" }, + buftype = { "nofile", "terminal", "help" }, + }, + }, + }, + remove_file = { + close_window = true, + }, + }, + trash = { + cmd = "trash", + require_confirm = true, + }, + live_filter = { + prefix = "[FILTER]: ", + always_show_folders = true, + }, + tab = { + sync = { + open = false, + close = false, + ignore = {}, + }, + }, + notify = { + threshold = vim.log.levels.INFO, + -- threshold = vim.log.levels.ERROR, + }, + log = { + enable = false, + truncate = false, + types = { + all = false, + config = false, + copy_paste = false, + dev = false, + diagnostics = false, + git = false, + profile = false, + watcher = false, + }, + }, + system_open = { + cmd = nil, + args = {}, + }, + }) + end + end + end, + }, +} diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 7168ca2..9e16cfb 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -61,7 +61,7 @@ return { -- overide nvimtree text fill color folder opened NvimTreeOpenedFolderName = { fg = "${blue}" }, -- overide nvimtree text fill color root folder - NvimTreeRootFolder = { fg = "${yellow}" }, + NvimTreeRootFolder = { fg = "${blue}" }, NvimTreeSpecialFile = { fg = "${orange}" }, NvimTreeWinSeparator = { fg = "#202329" }, NvimTreeIndentMarker = { fg = "#3E4450" }, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 1eec144..93a2713 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -35,7 +35,7 @@ return { "kyazdani42/nvim-tree.lua", lazy = true, -- event = "BufRead", - cmd = { "NvimTree", "NvimTreeToggle", "NvimTreeFocus", "NvimTreeClose" }, + cmd = { "NvimTree", "NvimTreeOpen", "NvimTreeToggle", "NvimTreeFocus", "NvimTreeClose" }, -- dependencies = "kyazdani42/nvim-web-devicons", config = function() local data_exists, treeconfig = pcall(require, "core.config") From 60b34681f626c69266e93ab3fafea51e994754b3 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Wed, 24 Apr 2024 18:57:10 +0700 Subject: [PATCH 10/23] add: update nvimtreefindfiletoggle --- lua/custom/keymaps.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua index 8cd41d9..0327d7c 100644 --- a/lua/custom/keymaps.lua +++ b/lua/custom/keymaps.lua @@ -2,4 +2,4 @@ local opts = { noremap = true, silent = true } local keymap = vim.api.nvim_set_keymap keymap("n", "]h", 'lua print("Testing")', opts) -keymap("n", "F", "NvimTreeToggle", opts) +keymap("n", "F", "NvimTreeFindFileToggle", opts) From 8b1ecc923bc0aeb1d03e5379a0135cc6d3251f11 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Thu, 25 Apr 2024 07:02:03 +0700 Subject: [PATCH 11/23] add: update config --- lua/custom/autocmd.lua | 6 ------ lua/custom/plugins/nvim_tree.lua | 9 +++++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lua/custom/autocmd.lua b/lua/custom/autocmd.lua index 874c696..6419fdb 100644 --- a/lua/custom/autocmd.lua +++ b/lua/custom/autocmd.lua @@ -65,9 +65,3 @@ vim.g.VM_Insert_hl = "DiffChange" -- end -- end, -- }) - --- auto open file if creation -local api = require("nvim-tree.api") -api.events.subscribe(api.events.Event.FileCreated, function(file) - vim.cmd("edit " .. file.fname) -end) diff --git a/lua/custom/plugins/nvim_tree.lua b/lua/custom/plugins/nvim_tree.lua index 1123684..f676736 100644 --- a/lua/custom/plugins/nvim_tree.lua +++ b/lua/custom/plugins/nvim_tree.lua @@ -2,7 +2,7 @@ return { { "kyazdani42/nvim-tree.lua", lazy = true, - -- event = "BufRead", + event = "VeryLazy", cmd = { "NvimTree", "NvimTreeOpen", "NvimTreeToggle", "NvimTreeFocus", "NvimTreeClose" }, -- dependencies = "kyazdani42/nvim-web-devicons", config = function() @@ -19,7 +19,7 @@ return { return end - local HEIGHT_RATIO = 0.8 -- You can change this + local HEIGHT_RATIO = 0.9 -- You can change this local WIDTH_RATIO = 0.5 -- You can change this too local icons = require("user.icons") @@ -269,6 +269,11 @@ return { }) end end + -- auto open file if creation + local api = require("nvim-tree.api") + api.events.subscribe(api.events.Event.FileCreated, function(file) + vim.cmd("edit " .. file.fname) + end) end, }, } From 6da1a73df0e5fe600dcba0b0a82a334b298c2422 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Thu, 25 Apr 2024 07:26:16 +0700 Subject: [PATCH 12/23] add: update config --- lua/custom/plugins/onedarkpro.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 9e16cfb..5701619 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -89,7 +89,7 @@ return { -- ["@property.javascript"] = { fg = "${cyan}" }, -- similar to `@field` ["@lsp.type.parameter"] = { fg = "${fg}" }, ["@lsp.type.property.lua"] = { fg = "${red}" }, - ["@lsp.type.variable.lua"] = { fg = "${fg}" }, + ["@lsp.type.variable"] = { fg = "${fg}" }, NvimTreeGitDirty = { fg = "${yellow}" }, Pmenu = { fg = "${fg}", bg = "${bg}" }, PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. From b318ced2cf73f5009e81517eec93b8323f42a7ea Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Thu, 25 Apr 2024 07:56:31 +0700 Subject: [PATCH 13/23] add: update config --- lua/custom/plugins/lualine_onedark.lua | 80 ++++++++++++++------------ 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/lua/custom/plugins/lualine_onedark.lua b/lua/custom/plugins/lualine_onedark.lua index 62cdaa4..29717e6 100644 --- a/lua/custom/plugins/lualine_onedark.lua +++ b/lua/custom/plugins/lualine_onedark.lua @@ -151,48 +151,52 @@ return { lsp_progress = lspprogress.progress end -- stylua: ignore - local is_transparat=true - local colors = require("onedarkpro.helpers").get_colors("onedark") + local onedark=vim.fn.fnamemodify("auto", ":t") + local is_transparat = true + local status_ok, onedarkpro = pcall(require, "onedarkpro.helpers") + if status_ok then + local colors = onedarkpro.get_colors("onedark") - local onedark = { - normal = { - a = { bg = colors.green, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.green }, - c = { - bg = is_transparat and colors.none or colors.bg_statusline, - fg = colors.fg, + onedark = { + normal = { + a = { bg = colors.green, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.green }, + c = { + bg = is_transparat and colors.none or colors.bg_statusline, + fg = colors.fg, + }, }, - }, - insert = { - a = { bg = colors.blue, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.blue }, - }, - visual = { - a = { bg = colors.yellow, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.yellow }, - }, - replace = { - a = { bg = colors.red, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.red }, - }, - command = { - a = { bg = colors.purple, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.purple }, - }, - terminal = { - a = { bg = colors.cyan, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.cyan }, - }, - inactive = { - a = { bg = colors.bg, fg = colors.blue }, - b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" }, - c = { - bg = is_transparat and colors.none or colors.bg, - fg = colors.fg_gutter_inactive, + insert = { + a = { bg = colors.blue, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.blue }, }, - }, - } + visual = { + a = { bg = colors.yellow, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.yellow }, + }, + replace = { + a = { bg = colors.red, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.red }, + }, + command = { + a = { bg = colors.purple, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.purple }, + }, + terminal = { + a = { bg = colors.cyan, fg = colors.bg }, + b = { bg = colors.fg_gutter, fg = colors.cyan }, + }, + inactive = { + a = { bg = colors.bg, fg = colors.blue }, + b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" }, + c = { + bg = is_transparat and colors.none or colors.bg, + fg = colors.fg_gutter_inactive, + }, + }, + } + end require("lualine").setup({ options = { From 474b9a96b84fca203098cad4de89370178367f77 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Fri, 26 Apr 2024 13:58:35 +0700 Subject: [PATCH 14/23] update --- lazy-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 1bab449..393780a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -43,9 +43,9 @@ "onedarkpro.nvim": { "branch": "main", "commit": "ec07364f3cfa9cc6467bf067a490cfd74011efcd" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, - "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, + "smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, - "telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" }, + "telescope.nvim": { "branch": "master", "commit": "35f94f0ef32d70e3664a703cefbe71bd1456d899" }, "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" }, "vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, From 1fa66b766781abdb79cfe960cecf932793fa713c Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Sat, 27 Apr 2024 08:34:41 +0700 Subject: [PATCH 15/23] add: update config github theme --- lazy-lock.json | 5 +- lua/core/init.lua | 2 +- lua/custom/plugins/githubdark.lua | 195 +++++++++++++++--------------- 3 files changed, 102 insertions(+), 100 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 393780a..1ca2ca6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,6 +13,7 @@ "codeium.vim": { "branch": "main", "commit": "76790ba8d1b8b3287f72366ea5f55c1d76e6114e" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, + "github-nvim-theme": { "branch": "main", "commit": "7e08e9cbf6da64b151f708a3e7e9f43447ae0171" }, "gitsigns.nvim": { "branch": "main", "commit": "52f8da33cc0cadbf1164c4a91c8bfd6895533d67" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, @@ -22,8 +23,8 @@ "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, - "none-ls-extras.nvim": { "branch": "main", "commit": "f0746bf4f1a21d6e1d2002f671fb9b46d2146de7" }, - "none-ls.nvim": { "branch": "main", "commit": "88821b67e6007041f43b802f58e3d9fa9bfce684" }, + "none-ls-extras.nvim": { "branch": "main", "commit": "c7264e9b97a051ccb955ae178b6fb3e0e9936a45" }, + "none-ls.nvim": { "branch": "main", "commit": "709a5e56f4273deca737d43355212ac94c1b5083" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index c77801c..44c794d 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -17,5 +17,5 @@ require("custom.keymaps") -- require("user.chat_gpt") -- vim.cmd("colorscheme one_monokai") -- vim.cmd("colorscheme onedark") --- vim.cmd("colorscheme github_dark_dimmed") +vim.cmd("colorscheme github_dark_dimmed") -- vim.cmd("colorscheme github_dark_high_contrast") diff --git a/lua/custom/plugins/githubdark.lua b/lua/custom/plugins/githubdark.lua index 8ff1867..3e1b5cd 100644 --- a/lua/custom/plugins/githubdark.lua +++ b/lua/custom/plugins/githubdark.lua @@ -1,99 +1,100 @@ return { - -- { - -- "navarasu/onedark.nvim", - -- enabled = false, - -- }, - -- { - -- "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 is_transparent = false - -- 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 = is_transparent, -- 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 = { - -- github_dark_dimmed = { - -- bg0 = is_transparent and "NONE" or "bg1", - -- bg1 = is_transparent and "NONE" or "bg", - -- }, - -- }, - -- specs = {}, - -- groups = { - -- all = { - -- illuminatedWord = { bg = "#3b4261" }, - -- illuminatedCurWord = { bg = "#3b4261" }, - -- IlluminatedWordText = { bg = "#3b4261" }, - -- IlluminatedWordRead = { bg = "#3b4261" }, - -- IlluminatedWordWrite = { bg = "#3b4261" }, - -- ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, - -- ["@text.uri"] = { fg = palette.const, style = "italic" }, - -- ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, - -- -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, - -- -- ["@operator.html"] = { fg = "#faa356" }, - -- -- ["@tag.html"] = { fg = "#fa7970" }, - -- -- ["@tag.delimiter.html"] = { fg = "#faa356" }, - -- ["@tag.javascript"] = { fg = "#faa356" }, - -- ["@tag.tsx"] = { fg = "#faa356" }, - -- }, - -- github_dark_high_contrast = { - -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - -- }, - -- github_dark_dimmed = { - -- -- As with specs and palettes, a specific style's value will be used over the `all`'s value. - -- NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, - -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - -- NvimTreeIndentMarker = { fg = "#3E4450" }, - -- BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, - -- BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, - -- LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, - -- StatusLine = { bg = is_transparent and "NONE" or "bg1" }, - -- StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, - -- Pmenu = { bg = is_transparent and "NONE" or "bg1" }, - -- PmenuSel = { link = "CursorLine" }, - -- WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, - -- LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, - -- LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, - -- }, - -- }, - -- }) - -- end, - -- }, + { + "navarasu/onedark.nvim", + enabled = false, + }, + { + "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 is_transparent = false + 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 = is_transparent, -- 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 = { + github_dark_dimmed = { + bg0 = is_transparent and "NONE" or "bg1", + bg1 = is_transparent and "NONE" or "bg", + }, + }, + specs = {}, + groups = { + all = { + illuminatedWord = { bg = "#3b4261" }, + illuminatedCurWord = { bg = "#3b4261" }, + IlluminatedWordText = { bg = "#3b4261" }, + IlluminatedWordRead = { bg = "#3b4261" }, + IlluminatedWordWrite = { bg = "#3b4261" }, + ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, + ["@text.uri"] = { fg = palette.const, style = "italic" }, + ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, + -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, + -- ["@operator.html"] = { fg = "#faa356" }, + -- ["@tag.html"] = { fg = "#fa7970" }, + -- ["@tag.delimiter.html"] = { fg = "#faa356" }, + ["@tag.javascript"] = { fg = "#faa356" }, + ["@tag.tsx"] = { fg = "#faa356" }, + }, + github_dark_high_contrast = { + NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + }, + github_dark_dimmed = { + -- As with specs and palettes, a specific style's value will be used over the `all`'s value. + NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, + NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + NvimTreeIndentMarker = { fg = "#3E4450" }, + BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, + BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, + LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, + StatusLine = { bg = is_transparent and "NONE" or "bg1" }, + StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, + Pmenu = { bg = is_transparent and "NONE" or "bg1" }, + PmenuSel = { link = "CursorLine" }, + WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, + LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, + LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, + NormalSB = { fg = "fg1", bg = "bg1" }, -- normal text + }, + }, + }) + end, + }, } From 6f1d1cebe505ab457f9b39edca1a1a6f29089373 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Sun, 28 Apr 2024 07:42:56 +0700 Subject: [PATCH 16/23] add: update --- lazy-lock.json | 1 - lua/core/init.lua | 2 +- lua/custom/plugins/githubdark.lua | 196 +++++++++++++++--------------- 3 files changed, 99 insertions(+), 100 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 1ca2ca6..7741126 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,7 +13,6 @@ "codeium.vim": { "branch": "main", "commit": "76790ba8d1b8b3287f72366ea5f55c1d76e6114e" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "github-nvim-theme": { "branch": "main", "commit": "7e08e9cbf6da64b151f708a3e7e9f43447ae0171" }, "gitsigns.nvim": { "branch": "main", "commit": "52f8da33cc0cadbf1164c4a91c8bfd6895533d67" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index 44c794d..c77801c 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -17,5 +17,5 @@ require("custom.keymaps") -- require("user.chat_gpt") -- vim.cmd("colorscheme one_monokai") -- vim.cmd("colorscheme onedark") -vim.cmd("colorscheme github_dark_dimmed") +-- vim.cmd("colorscheme github_dark_dimmed") -- vim.cmd("colorscheme github_dark_high_contrast") diff --git a/lua/custom/plugins/githubdark.lua b/lua/custom/plugins/githubdark.lua index 3e1b5cd..680a32f 100644 --- a/lua/custom/plugins/githubdark.lua +++ b/lua/custom/plugins/githubdark.lua @@ -1,100 +1,100 @@ return { - { - "navarasu/onedark.nvim", - enabled = false, - }, - { - "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 is_transparent = false - 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 = is_transparent, -- 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 = { - github_dark_dimmed = { - bg0 = is_transparent and "NONE" or "bg1", - bg1 = is_transparent and "NONE" or "bg", - }, - }, - specs = {}, - groups = { - all = { - illuminatedWord = { bg = "#3b4261" }, - illuminatedCurWord = { bg = "#3b4261" }, - IlluminatedWordText = { bg = "#3b4261" }, - IlluminatedWordRead = { bg = "#3b4261" }, - IlluminatedWordWrite = { bg = "#3b4261" }, - ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, - ["@text.uri"] = { fg = palette.const, style = "italic" }, - ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, - -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, - -- ["@operator.html"] = { fg = "#faa356" }, - -- ["@tag.html"] = { fg = "#fa7970" }, - -- ["@tag.delimiter.html"] = { fg = "#faa356" }, - ["@tag.javascript"] = { fg = "#faa356" }, - ["@tag.tsx"] = { fg = "#faa356" }, - }, - github_dark_high_contrast = { - NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - }, - github_dark_dimmed = { - -- As with specs and palettes, a specific style's value will be used over the `all`'s value. - NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, - NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - NvimTreeIndentMarker = { fg = "#3E4450" }, - BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, - BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, - LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, - StatusLine = { bg = is_transparent and "NONE" or "bg1" }, - StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, - Pmenu = { bg = is_transparent and "NONE" or "bg1" }, - PmenuSel = { link = "CursorLine" }, - WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, - LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, - LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, - NormalSB = { fg = "fg1", bg = "bg1" }, -- normal text - }, - }, - }) - end, - }, + -- { + -- "navarasu/onedark.nvim", + -- enabled = false, + -- }, + -- { + -- "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 is_transparent = false + -- 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 = is_transparent, -- 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 = { + -- github_dark_dimmed = { + -- bg0 = is_transparent and "NONE" or "bg1", + -- bg1 = is_transparent and "NONE" or "bg", + -- }, + -- }, + -- specs = {}, + -- groups = { + -- all = { + -- illuminatedWord = { bg = "#3b4261" }, + -- illuminatedCurWord = { bg = "#3b4261" }, + -- IlluminatedWordText = { bg = "#3b4261" }, + -- IlluminatedWordRead = { bg = "#3b4261" }, + -- IlluminatedWordWrite = { bg = "#3b4261" }, + -- ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, + -- ["@text.uri"] = { fg = palette.const, style = "italic" }, + -- ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, + -- -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, + -- -- ["@operator.html"] = { fg = "#faa356" }, + -- -- ["@tag.html"] = { fg = "#fa7970" }, + -- -- ["@tag.delimiter.html"] = { fg = "#faa356" }, + -- ["@tag.javascript"] = { fg = "#faa356" }, + -- ["@tag.tsx"] = { fg = "#faa356" }, + -- }, + -- github_dark_high_contrast = { + -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + -- }, + -- github_dark_dimmed = { + -- -- As with specs and palettes, a specific style's value will be used over the `all`'s value. + -- NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, + -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + -- NvimTreeIndentMarker = { fg = "#3E4450" }, + -- BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, + -- BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, + -- LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, + -- StatusLine = { bg = is_transparent and "NONE" or "bg1" }, + -- StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, + -- Pmenu = { bg = is_transparent and "NONE" or "bg1" }, + -- PmenuSel = { link = "CursorLine" }, + -- WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, + -- LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, + -- LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, + -- NormalSB = { fg = "fg1", bg = "bg1" }, -- normal text + -- }, + -- }, + -- }) + -- end, + -- }, } From d5d7c8f3f995ce5587330d752f4e24e13c3115ee Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Mon, 29 Apr 2024 07:11:30 +0700 Subject: [PATCH 17/23] add: update --- lazy-lock.json | 2 +- lua/user/webdevicons.lua | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index 7741126..3392523 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -29,7 +29,7 @@ "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, - "nvim-material-icon": { "branch": "main", "commit": "ee3d4f54a3bf9716b7f8ad5eefcaa53afebd24a1" }, + "nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, diff --git a/lua/user/webdevicons.lua b/lua/user/webdevicons.lua index afdf7e9..6f6a164 100644 --- a/lua/user/webdevicons.lua +++ b/lua/user/webdevicons.lua @@ -7,6 +7,9 @@ local material_icon_ok, material_icon = pcall(require, "nvim-material-icon") if not material_icon_ok then return end +material_icon.setup({ + override = {}, +}) web_devicons.setup({ override = material_icon.get_icons(), From 3a93cb9d58decb9267ab3325d3423c996827bd9f Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Wed, 1 May 2024 07:35:53 +0700 Subject: [PATCH 18/23] add: update patch plugins --- lazy-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 3392523..aaf01ca 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,8 +12,8 @@ "code_runner.nvim": { "branch": "main", "commit": "e40f651e98a0a12fcd44bf54a2ed258cfee5a914" }, "codeium.vim": { "branch": "main", "commit": "76790ba8d1b8b3287f72366ea5f55c1d76e6114e" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, - "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "52f8da33cc0cadbf1164c4a91c8bfd6895533d67" }, + "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" }, + "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, "lsp-progress.nvim": { "branch": "main", "commit": "83b16a9791fa788c0a7ca90374118ed15d2c09ed" }, @@ -23,7 +23,7 @@ "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "none-ls-extras.nvim": { "branch": "main", "commit": "c7264e9b97a051ccb955ae178b6fb3e0e9936a45" }, - "none-ls.nvim": { "branch": "main", "commit": "709a5e56f4273deca737d43355212ac94c1b5083" }, + "none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, @@ -33,7 +33,7 @@ "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, - "nvim-tree.lua": { "branch": "master", "commit": "ddd1d6eb21c45433bdc65cc8015f2457998f2bf2" }, + "nvim-tree.lua": { "branch": "master", "commit": "76db7ed0da3027882dd0a72de18643c2e26956dc" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" }, From be7f819532d72ff86c24b4149c6558d9292c34ba Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Mon, 6 May 2024 08:11:07 +0700 Subject: [PATCH 19/23] add: update config --- lazy-lock.json | 16 +++++---- lua/custom/keymaps.lua | 2 +- lua/custom/plugins/init.lua | 54 +++++++++++++++---------------- lua/custom/plugins/onedarkpro.lua | 4 ++- lua/user/dashboard.lua | 2 +- lua/user/keymaps.lua | 2 +- lua/user/startify.lua | 2 +- 7 files changed, 43 insertions(+), 39 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index aaf01ca..8db53a0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -9,23 +9,24 @@ "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": "e40f651e98a0a12fcd44bf54a2ed258cfee5a914" }, - "codeium.vim": { "branch": "main", "commit": "76790ba8d1b8b3287f72366ea5f55c1d76e6114e" }, + "code_runner.nvim": { "branch": "main", "commit": "d135c4178bf8980ca5fa4aa6e27ab9ee4373c875" }, + "codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, - "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" }, + "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" }, "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, - "lsp-progress.nvim": { "branch": "main", "commit": "83b16a9791fa788c0a7ca90374118ed15d2c09ed" }, + "lsp-progress.nvim": { "branch": "main", "commit": "0d45f17f681c2e664238a1f6c02865760692609d" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "none-ls-extras.nvim": { "branch": "main", "commit": "c7264e9b97a051ccb955ae178b6fb3e0e9936a45" }, "none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, - "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, + "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, @@ -45,10 +46,11 @@ "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" }, "statuscol.nvim": { "branch": "main", "commit": "483b9a596dfd63d541db1aa51ee6ee9a1441c4cc" }, - "telescope.nvim": { "branch": "master", "commit": "35f94f0ef32d70e3664a703cefbe71bd1456d899" }, + "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" }, "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" }, "vim-illuminate": { "branch": "master", "commit": "e522e0dd742a83506db0a72e1ced68c9c130f185" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" }, + "yanky.nvim": { "branch": "main", "commit": "9268018e92d02650a94e39dd5f5903c542f7ea11" } } \ No newline at end of file diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua index 0327d7c..76a2297 100644 --- a/lua/custom/keymaps.lua +++ b/lua/custom/keymaps.lua @@ -2,4 +2,4 @@ local opts = { noremap = true, silent = true } local keymap = vim.api.nvim_set_keymap keymap("n", "]h", 'lua print("Testing")', opts) -keymap("n", "F", "NvimTreeFindFileToggle", opts) +keymap("n", "f", "NvimTreeFindFileToggle", opts) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index d8764c7..814cb2e 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -19,37 +19,37 @@ return { -- }, -- }, -- }, - -- { - -- "echasnovski/mini.indentscope", - -- version = false, -- wait till new 0.7.0 release to put it back on semver - -- event = "BufReadPre", - -- opts = { - -- -- symbol = "▏", - -- -- symbol = "│", - -- symbol = icons.ui.LineMiddle, - -- options = { try_as_border = true }, - -- }, - -- config = function(_, opts) - -- vim.api.nvim_create_autocmd("FileType", { - -- pattern = { "help", "alpha", "dashboard", "NvimTree", "Trouble", "lazy", "mason" }, - -- callback = function() - -- vim.b.miniindentscope_disable = true - -- end, - -- }) - -- require("mini.indentscope").setup(opts) - -- end, - -- }, + { + "echasnovski/mini.indentscope", + version = false, -- wait till new 0.7.0 release to put it back on semver + event = "BufReadPre", + opts = { + -- symbol = "▏", + -- symbol = "│", + symbol = icons.ui.LineMiddle, + options = { try_as_border = true }, + }, + config = function(_, opts) + vim.api.nvim_create_autocmd("FileType", { + pattern = { "help", "alpha", "dashboard", "NvimTree", "Trouble", "lazy", "mason" }, + callback = function() + vim.b.miniindentscope_disable = true + end, + }) + require("mini.indentscope").setup(opts) + end, + }, { "hrsh7th/cmp-nvim-lua", enabled = false, }, - -- { - -- "gbprod/yanky.nvim", - -- event = "BufReadPre", - -- config = function() - -- require("user.yanky") - -- end, - -- }, + { + "gbprod/yanky.nvim", + event = "BufReadPre", + config = function() + require("user.yanky") + end, + }, -- { -- "is0n/jaq-nvim", -- event = "BufRead", diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 5701619..c70c78d 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -4,7 +4,7 @@ return { "olimorris/onedarkpro.nvim", priority = 1000, -- Ensure it loads first config = function() - local is_transparent = false + local is_transparent = true require("onedarkpro").setup({ styles = { types = "NONE", @@ -116,6 +116,8 @@ return { TermCursor = { bg = "${fg}" }, TSRainbowRed = { fg = "${cyan}" }, TSRainbowCyan = { fg = "${red}" }, + NonText = { fg = "${fg}", bg = is_transparent and "NONE" or "#30333d" }, + MiniIndentscopeSymbol = { fg = "${cyan}" }, }, }) end, diff --git a/lua/user/dashboard.lua b/lua/user/dashboard.lua index 39baf06..14bd33b 100644 --- a/lua/user/dashboard.lua +++ b/lua/user/dashboard.lua @@ -25,7 +25,7 @@ end local dashboard = require("alpha.themes.dashboard") dashboard.section.header.val = board dashboard.section.buttons.val = { - dashboard.button("f", "󰈞 Find file", ":Telescope find_files "), + dashboard.button("F", "󰈞 Find file", ":Telescope find_files "), dashboard.button("e", " New file", ":ene startinsert "), dashboard.button("p", "󰉋 Find project", ":Telescope projects "), dashboard.button("r", "󰦛 Recently used files", ":Telescope oldfiles "), diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index 84331fa..95916bc 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -52,7 +52,7 @@ keymap("v", "", '"+y', opts) keymap("x", "", '"+y', opts) keymap("n", "", '"+P', opts) keymap("v", "", '"+P', opts) -keymap("i", "", "pa", opts) +keymap("i", "", "pa", opts) keymap("x", "", '"+P', opts) keymap("n", "", "undo", opts) keymap("x", "", "undo", opts) diff --git a/lua/user/startify.lua b/lua/user/startify.lua index 75396e6..551f365 100644 --- a/lua/user/startify.lua +++ b/lua/user/startify.lua @@ -18,7 +18,7 @@ if data_exists then end startify.section.header.val = dash_model startify.section.top_buttons.val = { - startify.button("f", "󰈞 Find file", ":Telescope find_files "), + startify.button("F", "󰈞 Find file", ":Telescope find_files "), startify.button("e", " New file", ":ene startinsert "), startify.button("p", "󰉋 Find project", ":Telescope projects "), startify.button("r", "󰦛 Recently used files", ":Telescope oldfiles "), From 0008ef23969ed427155d3edad2762342cde0a137 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Tue, 7 May 2024 15:11:04 +0700 Subject: [PATCH 20/23] add: update config --- lazy-lock.json | 2 +- lua/custom/plugins/onedarkpro.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 8db53a0..271f504 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -37,7 +37,7 @@ "nvim-tree.lua": { "branch": "master", "commit": "76db7ed0da3027882dd0a72de18643c2e26956dc" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index c70c78d..25ebe90 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -4,7 +4,7 @@ return { "olimorris/onedarkpro.nvim", priority = 1000, -- Ensure it loads first config = function() - local is_transparent = true + local is_transparent = false require("onedarkpro").setup({ styles = { types = "NONE", From 3952406bab6094d7ef2b55ece72cad4575300644 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Wed, 8 May 2024 07:53:02 +0700 Subject: [PATCH 21/23] add: update patch plugins --- lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index 271f504..e5e6e08 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,7 +12,7 @@ "code_runner.nvim": { "branch": "main", "commit": "d135c4178bf8980ca5fa4aa6e27ab9ee4373c875" }, "codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, - "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" }, + "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, From ee2321f4b0c5a9e716ead3d12a692462389e3deb Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Wed, 8 May 2024 20:34:34 +0700 Subject: [PATCH 22/23] add: update plugins patch --- lazy-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lazy-lock.json b/lazy-lock.json index e5e6e08..52f582f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -27,7 +27,7 @@ "none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, - "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, + "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" }, From e6df88afa45fad5e66a8ab4a1a41abf0d158eaf1 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Thu, 9 May 2024 12:47:07 +0700 Subject: [PATCH 23/23] add: update config --- lazy-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/lazy-lock.json b/lazy-lock.json index 52f582f..a2ce6c1 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -29,6 +29,7 @@ "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, + "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },