diff --git a/lua/core/neovide.lua b/lua/core/neovide.lua index 97ead35..2595084 100644 --- a/lua/core/neovide.lua +++ b/lua/core/neovide.lua @@ -12,9 +12,9 @@ if vim.g.neovide then vim.o.guifont = "Hasklug_Nerd_Font:h15" vim.g.neovide_padding_top = 0 - vim.g.neovide_padding_bottom = 0 - vim.g.neovide_padding_right = 0 - vim.g.neovide_padding_left = 0 + vim.g.neovide_padding_bottom = 1 + vim.g.neovide_padding_right = 1 + vim.g.neovide_padding_left = 1 -- config for transparent --vim.g.neovide_transparency = 0.8 diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 1657469..d7c78ed 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -14,522 +14,523 @@ local material_style = "oceanic" local onedark_style = "dark" _G.switch = function(param, case_table) - local case = case_table[param] - if case then - return case() - end - local def = case_table["default"] - return def and def() or nil + local case = case_table[param] + if case then + return case() + end + local def = case_table["default"] + return def and def() or nil end local data_exists, config = pcall(require, "core.config") if data_exists then - if config.colorscheme ~= nil then - local color = config.colorscheme - switch(color, { - ["tokyonight"] = function() - gruvbox = false - tokyonight = true - end, - ["tokyonight-night"] = function() - gruvbox = false - tokyonight = true - end, - ["tokyonight-storm"] = function() - gruvbox = false - tokyonight = true - end, - ["tokyonight-day"] = function() - gruvbox = false - tokyonight = true - end, - ["tokyonight-moon"] = function() - gruvbox = false - tokyonight = true - end, - ["sonokai"] = function() - gruvbox = false - sonokai = true - sonokai_style = "default" - end, - ["sonokai_atlantis"] = function() - gruvbox = false - sonokai = true - sonokai_style = "atlantis" - end, - ["sonokai_andromeda"] = function() - gruvbox = false - sonokai = true - sonokai_style = "andromeda" - end, - ["sonokai_shusia"] = function() - gruvbox = false - sonokai = true - sonokai_style = "shusia" - end, - ["sonokai_maia"] = function() - gruvbox = false - sonokai = true - sonokai_style = "maia" - end, - ["sonokai_espresso"] = function() - gruvbox = false - sonokai = true - sonokai_style = "espresso" - end, - ["material"] = function() - gruvbox = false - material = true - end, - ["material_deepocean"] = function() - gruvbox = false - material = true - material_style = "deep ocean" - end, - ["material_palenight"] = function() - gruvbox = false - material = true - material_style = "palenight" - end, - ["material_lighter"] = function() - gruvbox = false - material = true - material_style = "lighter" - end, - ["material_darker"] = function() - gruvbox = false - material = true - material_style = "darker" - end, - ["onedark"] = function() - gruvbox = false - onedark = true - end, - ["onedark_darker"] = function() - gruvbox = false - onedark = true - onedark_style = "darker" - end, - ["onedark_cool"] = function() - gruvbox = false - onedark = true - onedark_style = "cool" - end, - ["onedark_deep"] = function() - gruvbox = false - onedark = true - onedark_style = "deep" - end, - ["onedark_warm"] = function() - gruvbox = false - onedark = true - onedark_style = "warm" - end, - ["onedark_warmer"] = function() - gruvbox = false - onedark = true - onedark_style = "warmer" - end, - ["onedark_light"] = function() - gruvbox = false - onedark = true - onedark_style = "light" - end, - ["lunar"] = function() - gruvbox = false - lunar = true - end, - ["nord"] = function() - gruvbox = false - nord = true - end, - ["catppuccin"] = function() - gruvbox = false - catppuccin = true - end, - ["catppuccin-latte"] = function() - gruvbox = false - catppuccin = true - end, - ["catppuccin-frappe"] = function() - gruvbox = false - catppuccin = true - end, - ["catppuccin-macchiato"] = function() - gruvbox = false - catppuccin = true - end, - ["catppuccin-mocha"] = function() - gruvbox = false - catppuccin = true - end, - ["dracula"] = function() - gruvbox = false - dracula = true - end, - ["nightfox"] = function() - gruvbox = false - nightfox = true - end, - ["dayfox"] = function() - gruvbox = false - nightfox = true - end, - ["dawnfox"] = function() - gruvbox = false - nightfox = true - end, - ["duskfox"] = function() - gruvbox = false - nightfox = true - end, - ["nordfox"] = function() - gruvbox = false - nightfox = true - end, - ["terafox"] = function() - gruvbox = false - nightfox = true - end, - ["carbonfox"] = function() - gruvbox = false - nightfox = true - end, - ["gruvbox-baby"] = function() - gruvbox = true - end, - default = function() - gruvbox = true - end, - }) - end + if config.colorscheme ~= nil then + local color = config.colorscheme + switch(color, { + ["tokyonight"] = function() + gruvbox = false + tokyonight = true + end, + ["tokyonight-night"] = function() + gruvbox = false + tokyonight = true + end, + ["tokyonight-storm"] = function() + gruvbox = false + tokyonight = true + end, + ["tokyonight-day"] = function() + gruvbox = false + tokyonight = true + end, + ["tokyonight-moon"] = function() + gruvbox = false + tokyonight = true + end, + ["sonokai"] = function() + gruvbox = false + sonokai = true + sonokai_style = "default" + end, + ["sonokai_atlantis"] = function() + gruvbox = false + sonokai = true + sonokai_style = "atlantis" + end, + ["sonokai_andromeda"] = function() + gruvbox = false + sonokai = true + sonokai_style = "andromeda" + end, + ["sonokai_shusia"] = function() + gruvbox = false + sonokai = true + sonokai_style = "shusia" + end, + ["sonokai_maia"] = function() + gruvbox = false + sonokai = true + sonokai_style = "maia" + end, + ["sonokai_espresso"] = function() + gruvbox = false + sonokai = true + sonokai_style = "espresso" + end, + ["material"] = function() + gruvbox = false + material = true + end, + ["material_deepocean"] = function() + gruvbox = false + material = true + material_style = "deep ocean" + end, + ["material_palenight"] = function() + gruvbox = false + material = true + material_style = "palenight" + end, + ["material_lighter"] = function() + gruvbox = false + material = true + material_style = "lighter" + end, + ["material_darker"] = function() + gruvbox = false + material = true + material_style = "darker" + end, + ["onedark"] = function() + gruvbox = false + onedark = true + end, + ["onedark_darker"] = function() + gruvbox = false + onedark = true + onedark_style = "darker" + end, + ["onedark_cool"] = function() + gruvbox = false + onedark = true + onedark_style = "cool" + end, + ["onedark_deep"] = function() + gruvbox = false + onedark = true + onedark_style = "deep" + end, + ["onedark_warm"] = function() + gruvbox = false + onedark = true + onedark_style = "warm" + end, + ["onedark_warmer"] = function() + gruvbox = false + onedark = true + onedark_style = "warmer" + end, + ["onedark_light"] = function() + gruvbox = false + onedark = true + onedark_style = "light" + end, + ["lunar"] = function() + gruvbox = false + lunar = true + end, + ["nord"] = function() + gruvbox = false + nord = true + end, + ["catppuccin"] = function() + gruvbox = false + catppuccin = true + end, + ["catppuccin-latte"] = function() + gruvbox = false + catppuccin = true + end, + ["catppuccin-frappe"] = function() + gruvbox = false + catppuccin = true + end, + ["catppuccin-macchiato"] = function() + gruvbox = false + catppuccin = true + end, + ["catppuccin-mocha"] = function() + gruvbox = false + catppuccin = true + end, + ["dracula"] = function() + gruvbox = false + dracula = true + end, + ["nightfox"] = function() + gruvbox = false + nightfox = true + end, + ["dayfox"] = function() + gruvbox = false + nightfox = true + end, + ["dawnfox"] = function() + gruvbox = false + nightfox = true + end, + ["duskfox"] = function() + gruvbox = false + nightfox = true + end, + ["nordfox"] = function() + gruvbox = false + nightfox = true + end, + ["terafox"] = function() + gruvbox = false + nightfox = true + end, + ["carbonfox"] = function() + gruvbox = false + nightfox = true + end, + ["gruvbox-baby"] = function() + gruvbox = true + end, + default = function() + gruvbox = true + end, + }) + end end local transparent = false local transparent_mode = config.transparent_mode if transparent_mode ~= nil then - if transparent_mode == 1 then - transparent = true - end + if transparent_mode == 1 then + transparent = true + end end return { - -- color scheme - { - "luisiacc/gruvbox-baby", - lazy = true, - enabled = gruvbox, - config = function() - local colors = require("gruvbox-baby.colors").config() - vim.g.gruvbox_baby_highlights = { - StatusLine = { fg = colors.fg, bg = "NONE" }, - } - end, - }, - { - "Mofiqul/dracula.nvim", - enabled = dracula, - config = function() - local is_transparent = false - local colors = require("dracula").colors() - if is_transparent then - colors = { - bg = "none", - } - end - require("dracula").setup({ - colors = { - -- purple = "#FCC76A", - menu = colors.bg, - }, - italic_comment = true, - lualine_bg_color = colors.bg, - overrides = { - Keywords = { fg = colors.cyan, italic = true }, - -- Function = { fg = colors.yellow, italic = true }, - ["@keyword"] = { fg = colors.pink, italic = true }, - ["@keyword.function"] = { fg = colors.cyan, italic = true }, - ["@function"] = { fg = colors.green, italic = true }, - ["@tag.attribute"] = { fg = colors.green, italic = true }, - NvimTreeFolderIcon = { fg = "#6776a7" }, - CmpItemAbbr = { fg = "#ABB2BF" }, - CmpItemKind = { fg = "#ABB2BF" }, - CmpItemAbbrDeprecated = { fg = "#ABB2BF" }, - CmpItemAbbrMatch = { fg = "#8BE9FD" }, - htmlLink = { fg = "#BD93F9", underline = false }, - Underlined = { fg = "#8BE9FD" }, - NvimTreeSpecialFile = { fg = "#FF79C6" }, - MatchParen = { fg = "#F8F8F2" }, - SpellBad = { fg = "#FF6E6E" }, - illuminatedWord = { bg = "#3b4261" }, - illuminatedCurWord = { bg = "#3b4261" }, - IlluminatedWordText = { bg = "#3b4261" }, - IlluminatedWordRead = { bg = "#3b4261" }, - IlluminatedWordWrite = { bg = "#3b4261" }, - StatusLine = { fg = "#f8f8f2", bg = colors.bg }, - StatusLineTerm = { fg = "#f8f8f2", bg = colors.bg }, - BufferLineFill = { bg = colors.bg }, - Pmenu = { fg = colors.white, bg = colors.bg }, - }, - transparent_bg = transparent, - -- transparent_bg = is_transparent, - }) - end, - }, - { - "folke/tokyonight.nvim", - enabled = tokyonight, - config = function() - require("user.tokyonight") - end, - }, - { - "shaunsingh/nord.nvim", - enabled = nord, - config = function() - vim.g.nord_disable_background = transparent - require("nord").set() - end, - }, - { - "sainnhe/sonokai", - enabled = sonokai, - config = function() - vim.g.sonokai_style = sonokai_style - end, - }, - { "lunarvim/lunar.nvim", enabled = lunar }, - { - "marko-cerovac/material.nvim", - enabled = material, - config = function() - local colors = require("material.colors") - vim.g.material_style = material_style - require("material").setup({ - lualine_style = "stealth", - disable = { - background = transparent, - }, - plugins = { -- Uncomment the plugins that you use to highlight them - -- Available plugins: - "dap", - -- "dashboard", - -- "eyeliner", - "fidget", - -- "flash", - -- "gitsigns", - -- "harpoon", - -- "hop", - "illuminate", - "indent-blankline", - -- "lspsaga", - "mini", - -- "neogit", - -- "neotest", - -- "neo-tree", - -- "neorg", - "noice", - "nvim-cmp", - "nvim-navic", - "nvim-tree", - "nvim-web-devicons", - -- "rainbow-delimiters", - -- "sneak", - "telescope", - -- "trouble", - "which-key", - "nvim-notify", - }, - custom_highlights = { - BufferLineFill = { bg = colors.bg }, - StatusLine = { fg = "#f8f8f2", bg = colors.bg }, - StatusLineTerm = { fg = "#f8f8f2", bg = colors.bg }, - }, - }) - end, - }, - { - "navarasu/onedark.nvim", - enabled = onedark, - priority = 1000, - config = function() - -- Lua - require("onedark").setup({ - term_colors = true, - style = onedark_style, - colors = { - bg0 = "#1e222a", - green = "#98c379", - gray = "#abb2bf", - red = "#e06c75", - purple = "#c678dd", - yellow = "#e5c07b", - orange = "#d19a66", - blue = "#61afef", - cyan = "#56b6c2", - bg_d = "$bg", - bg1 = "#1e222a", - }, - code_style = { - comments = "italic", - keywords = "italic", - functions = "none", - strings = "none", - variables = "none", - }, - highlights = { - NoiceCursor = { fg = "$bg0", bg = "$fg" }, - Search = { fg = "$bg0", bg = "$bg_yellow" }, - -- BorderBG = { fg = "#333842" }, -- untuk custom brder color cmp - -- overide indent line fill color - NvimTreeNormal = { fg = "$fg", bg = "$bg0" }, - NvimTreeIndentMarker = { fg = "#3E4450" }, - IblIndent = { fg = "#3E4450" }, - -- NvimTreeFolderIcon = { bg = "NONE", fg = "$blue" }, - ["@markup.link.url"] = { fg = "$cyan", fmt = "italic" }, - ["@text.uri"] = { fg = "$cyan", fmt = "none" }, - ["@tag.delimiter"] = { fg = "$gray" }, - ["@tag.html"] = { fg = "$red" }, - ["@tag.attribute"] = { fg = "$orange", fmt = "italic" }, - ["@tag.javascript"] = { fg = "$red" }, - ["@constructor.javascript"] = { fg = "$red" }, - ["@tag.tsx"] = { fg = "$yellow" }, - ["@constructor.tsx"] = { fg = "$yellow" }, - -- NvimTreeFolderIcon = { fg = "#FCC76A" }, - NvimTreeSpecialFile = { fg = "$yellow", fmt = "italic" }, - BufferLineFill = { bg = "$bg0" }, - BufferLineUnfocusedFill = { bg = "$bg0" }, - StatusLine = { fg = "#f8f8f2", bg = "$bg0" }, - StatusLineTerm = { fg = "#f8f8f2", bg = "$bg0" }, - illuminatedWord = { bg = "#3b4261" }, - illuminatedCurWord = { bg = "#3b4261" }, - IlluminatedWordText = { bg = "#3b4261" }, - IlluminatedWordRead = { bg = "#3b4261" }, - IlluminatedWordWrite = { bg = "#3b4261" }, - PmenuSel = { fg = "$fg", bg = "#333842" }, - -- overide lualine fill color with bg color - LualineNormal = { bg = "$bg0" }, - -- overide lualine_c fill color with bg color - LualineC = { bg = "$bg0" }, - -- overide lualine_x fill color with bg color - LualineX = { bg = "$bg0" }, - -- overide which-key fill color with bg color - WhichKey = { bg = "$bg0" }, - -- overide which-key fill color with bg color - WhichKeySeperator = { bg = "$bg0" }, - -- overide which-key fill color with bg color - WhichKeyDesc = { bg = "$bg0" }, - -- overide which-key fill color with bg color - WhichKeyFloat = { bg = "$bg0" }, - -- overide which-key fill color with bg color - WhichKeyValue = { bg = "$bg0" }, - -- overide which-key fill color with bg color - WhichKeyBorder = { bg = "$bg0" }, - -- overide Lazy fill color with bg color - -- LazyNormal = { bg = "$bg0" }, - -- -- overide lazy background color with bg color - -- LazyBackground = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazyH1 = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazyH2 = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazyH3 = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazyH4 = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazyH5 = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazyH6 = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazyButton = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazyButtonActive = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazySpecial = { bg = "$bg0" }, - -- -- overide Lazy fill color with bg color - -- LazyProgress = { bg = "$bg0" }, - -- Pmenu = { fg = "$fg", bg = "$bg0" }, - CursorLine = { bg = "#333842" }, - Cursor = { fg = "$bg0", bg = "$fg" }, -- character under the cursor - lCursor = { fg = "$bg0", bg = "$fg" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - CursorIM = { fg = "$bg0", bg = "$fg" }, -- like Cursor, but used when in IME mode |CursorIM| - CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - -- Visual = { bg = "$orange" }, - DiffText = { bg = "$orange" }, - DiffAdd = { bg = "#595d65" }, - MiniIndentscopeSymbol = { fg = "$cyan", nocombine = true }, - -- UfoPreviewNormal = { fg = "#373d48", bg = "$bg0" }, - -- UfoPreviewBorder = { fg = "#373d48", bg = "$bg0" }, - -- UfoPreviewCursorLine = { fg = "#373d48", bg = "$bg0" }, - }, - transparent = transparent, - lualine = { - transparent = true, - }, - }) - require("onedark").load() - end, - }, - { - "catppuccin/nvim", - enabled = catppuccin, - name = "catppuccin", - init = function() - require("user.catppuccin") - end, - }, - { - "EdenEast/nightfox.nvim", - enabled = nightfox, - config = function() - local palette = require("nightfox.palette").load("nightfox") - local Color = require("nightfox.lib.color") - local bg = Color.from_hex(palette.bg1) - require("nightfox").setup({ - options = { - terminal_colors = true, - transparent = transparent, - styles = { -- Style to be applied to different syntax groups - comments = "italic", -- Value is any valid attr-list value `:help attr-list` - conditionals = "italic", - constants = "NONE", - functions = "NONE", - keywords = "italic", - numbers = "NONE", - operators = "NONE", - strings = "NONE", - types = "NONE", - variables = "NONE", - }, - }, - palettes = { - all = { - bg0 = palette.bg1, - bg = palette.bg1, - }, - }, - specs = {}, - groups = { - all = { - -- overide bufferline fill color - BufferLineFill = { bg = palette.bg1 }, - BufferLineUnfocusedFill = { bg = palette.bg }, - -- overide nvimtree fill color with bg color - NvimTreeNormal = { bg = palette.bg }, - NvimTreeWinSeparator = { - fg = palette.bg0, - }, - Underlined = { style = "NONE" }, -- overide statusline fill color with bg color - StatusLine = { bg = "NONE" }, - StatusLineTerm = { bg = palette.bg }, - -- overide lualine fill color with bg color - LualineNormal = { bg = palette.bg }, - Pmenu = { bg = "bg3" }, - PmenuSel = { bg = "bg3" }, - }, - }, - }) - end, - }, + -- color scheme + { + "luisiacc/gruvbox-baby", + lazy = true, + enabled = gruvbox, + config = function() + local colors = require("gruvbox-baby.colors").config() + vim.g.gruvbox_baby_highlights = { + StatusLine = { fg = colors.fg, bg = "NONE" }, + } + end, + }, + { + "Mofiqul/dracula.nvim", + enabled = dracula, + config = function() + local is_transparent = false + local colors = require("dracula").colors() + if is_transparent then + colors = { + bg = "none", + } + end + require("dracula").setup({ + colors = { + -- purple = "#FCC76A", + menu = colors.bg, + }, + italic_comment = true, + lualine_bg_color = colors.bg, + overrides = { + Keywords = { fg = colors.cyan, italic = true }, + -- Function = { fg = colors.yellow, italic = true }, + ["@keyword"] = { fg = colors.pink, italic = true }, + ["@keyword.function"] = { fg = colors.cyan, italic = true }, + ["@function"] = { fg = colors.green, italic = true }, + ["@tag.attribute"] = { fg = colors.green, italic = true }, + NvimTreeFolderIcon = { fg = "#6776a7" }, + CmpItemAbbr = { fg = "#ABB2BF" }, + CmpItemKind = { fg = "#ABB2BF" }, + CmpItemAbbrDeprecated = { fg = "#ABB2BF" }, + CmpItemAbbrMatch = { fg = "#8BE9FD" }, + htmlLink = { fg = "#BD93F9", underline = false }, + Underlined = { fg = "#8BE9FD" }, + NvimTreeSpecialFile = { fg = "#FF79C6" }, + MatchParen = { fg = "#F8F8F2" }, + SpellBad = { fg = "#FF6E6E" }, + illuminatedWord = { bg = "#3b4261" }, + illuminatedCurWord = { bg = "#3b4261" }, + IlluminatedWordText = { bg = "#3b4261" }, + IlluminatedWordRead = { bg = "#3b4261" }, + IlluminatedWordWrite = { bg = "#3b4261" }, + StatusLine = { fg = "#f8f8f2", bg = colors.bg }, + StatusLineTerm = { fg = "#f8f8f2", bg = colors.bg }, + BufferLineFill = { bg = colors.bg }, + Pmenu = { fg = colors.white, bg = colors.bg }, + }, + transparent_bg = transparent, + -- transparent_bg = is_transparent, + }) + end, + }, + { + "folke/tokyonight.nvim", + enabled = tokyonight, + config = function() + require("user.tokyonight") + end, + }, + { + "shaunsingh/nord.nvim", + enabled = nord, + config = function() + vim.g.nord_disable_background = transparent + require("nord").set() + end, + }, + { + "sainnhe/sonokai", + enabled = sonokai, + config = function() + vim.g.sonokai_style = sonokai_style + end, + }, + { "lunarvim/lunar.nvim", enabled = lunar }, + { + "marko-cerovac/material.nvim", + enabled = material, + config = function() + local colors = require("material.colors") + vim.g.material_style = material_style + require("material").setup({ + lualine_style = "stealth", + disable = { + background = transparent, + }, + plugins = { -- Uncomment the plugins that you use to highlight them + -- Available plugins: + "dap", + -- "dashboard", + -- "eyeliner", + "fidget", + -- "flash", + -- "gitsigns", + -- "harpoon", + -- "hop", + "illuminate", + "indent-blankline", + -- "lspsaga", + "mini", + -- "neogit", + -- "neotest", + -- "neo-tree", + -- "neorg", + "noice", + "nvim-cmp", + "nvim-navic", + "nvim-tree", + "nvim-web-devicons", + -- "rainbow-delimiters", + -- "sneak", + "telescope", + -- "trouble", + "which-key", + "nvim-notify", + }, + custom_highlights = { + BufferLineFill = { bg = colors.bg }, + StatusLine = { fg = "#f8f8f2", bg = colors.bg }, + StatusLineTerm = { fg = "#f8f8f2", bg = colors.bg }, + }, + }) + end, + }, + { + "navarasu/onedark.nvim", + enabled = onedark, + priority = 1000, + config = function() + -- Lua + require("onedark").setup({ + term_colors = true, + style = onedark_style, + colors = { + bg0 = "#1e222a", + green = "#98c379", + gray = "#abb2bf", + red = "#e06c75", + purple = "#c678dd", + yellow = "#e5c07b", + orange = "#d19a66", + blue = "#61afef", + cyan = "#56b6c2", + bg_d = "$bg", + bg1 = "#1e222a", + }, + code_style = { + comments = "italic", + keywords = "italic", + functions = "none", + strings = "none", + variables = "none", + }, + highlights = { + NoiceCursor = { fg = "$bg0", bg = "$fg" }, + Search = { fg = "$bg0", bg = "$bg_yellow" }, + -- BorderBG = { fg = "#333842" }, -- untuk custom brder color cmp + -- overide indent line fill color + NvimTreeNormal = { fg = "$fg", bg = "$bg0" }, + NvimTreeIndentMarker = { fg = "#3E4450" }, + -- NvimTreeGitIgnored = { fg = "$gray", bg = "NONE" }, + IblIndent = { fg = "#3E4450" }, + -- NvimTreeFolderIcon = { bg = "NONE", fg = "$blue" }, + ["@markup.link.url"] = { fg = "$cyan", fmt = "italic" }, + ["@text.uri"] = { fg = "$cyan", fmt = "none" }, + ["@tag.delimiter"] = { fg = "$gray" }, + ["@tag.html"] = { fg = "$red" }, + ["@tag.attribute"] = { fg = "$orange", fmt = "italic" }, + ["@tag.javascript"] = { fg = "$red" }, + ["@constructor.javascript"] = { fg = "$red" }, + ["@tag.tsx"] = { fg = "$yellow" }, + ["@constructor.tsx"] = { fg = "$yellow" }, + -- NvimTreeFolderIcon = { fg = "#FCC76A" }, + NvimTreeSpecialFile = { fg = "$yellow", fmt = "italic" }, + BufferLineFill = { bg = "$bg0" }, + BufferLineUnfocusedFill = { bg = "$bg0" }, + StatusLine = { fg = "#f8f8f2", bg = "$bg0" }, + StatusLineTerm = { fg = "#f8f8f2", bg = "$bg0" }, + illuminatedWord = { bg = "#3b4261" }, + illuminatedCurWord = { bg = "#3b4261" }, + IlluminatedWordText = { bg = "#3b4261" }, + IlluminatedWordRead = { bg = "#3b4261" }, + IlluminatedWordWrite = { bg = "#3b4261" }, + PmenuSel = { fg = "$fg", bg = "#333842" }, + -- overide lualine fill color with bg color + LualineNormal = { bg = "$bg0" }, + -- overide lualine_c fill color with bg color + LualineC = { bg = "$bg0" }, + -- overide lualine_x fill color with bg color + LualineX = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKey = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeySeperator = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeyDesc = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeyFloat = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeyValue = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeyBorder = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + -- LazyNormal = { bg = "$bg0" }, + -- -- overide lazy background color with bg color + -- LazyBackground = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazyH1 = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazyH2 = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazyH3 = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazyH4 = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazyH5 = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazyH6 = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazyButton = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazyButtonActive = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazySpecial = { bg = "$bg0" }, + -- -- overide Lazy fill color with bg color + -- LazyProgress = { bg = "$bg0" }, + -- Pmenu = { fg = "$fg", bg = "$bg0" }, + CursorLine = { bg = "#333842" }, + Cursor = { fg = "$bg0", bg = "$fg" }, -- character under the cursor + lCursor = { fg = "$bg0", bg = "$fg" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + CursorIM = { fg = "$bg0", bg = "$fg" }, -- like Cursor, but used when in IME mode |CursorIM| + CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + -- Visual = { bg = "$orange" }, + DiffText = { bg = "$orange" }, + DiffAdd = { bg = "#595d65" }, + MiniIndentscopeSymbol = { fg = "$cyan", nocombine = true }, + -- UfoPreviewNormal = { fg = "#373d48", bg = "$bg0" }, + -- UfoPreviewBorder = { fg = "#373d48", bg = "$bg0" }, + -- UfoPreviewCursorLine = { fg = "#373d48", bg = "$bg0" }, + }, + transparent = transparent, + lualine = { + transparent = true, + }, + }) + require("onedark").load() + end, + }, + { + "catppuccin/nvim", + enabled = catppuccin, + name = "catppuccin", + init = function() + require("user.catppuccin") + end, + }, + { + "EdenEast/nightfox.nvim", + enabled = nightfox, + config = function() + local palette = require("nightfox.palette").load("nightfox") + local Color = require("nightfox.lib.color") + local bg = Color.from_hex(palette.bg1) + require("nightfox").setup({ + options = { + terminal_colors = true, + transparent = transparent, + styles = { -- Style to be applied to different syntax groups + comments = "italic", -- Value is any valid attr-list value `:help attr-list` + conditionals = "italic", + constants = "NONE", + functions = "NONE", + keywords = "italic", + numbers = "NONE", + operators = "NONE", + strings = "NONE", + types = "NONE", + variables = "NONE", + }, + }, + palettes = { + all = { + bg0 = palette.bg1, + bg = palette.bg1, + }, + }, + specs = {}, + groups = { + all = { + -- overide bufferline fill color + BufferLineFill = { bg = palette.bg1 }, + BufferLineUnfocusedFill = { bg = palette.bg }, + -- overide nvimtree fill color with bg color + NvimTreeNormal = { bg = palette.bg }, + NvimTreeWinSeparator = { + fg = palette.bg0, + }, + Underlined = { style = "NONE" }, -- overide statusline fill color with bg color + StatusLine = { bg = "NONE" }, + StatusLineTerm = { bg = palette.bg }, + -- overide lualine fill color with bg color + LualineNormal = { bg = palette.bg }, + Pmenu = { bg = "bg3" }, + PmenuSel = { bg = "bg3" }, + }, + }, + }) + end, + }, } diff --git a/lua/user/nvim-tree.lua b/lua/user/nvim-tree.lua index 699f5dc..4d05eba 100644 --- a/lua/user/nvim-tree.lua +++ b/lua/user/nvim-tree.lua @@ -109,7 +109,7 @@ nvim_tree.setup({ -- root_folder_modifier = ":t", root_folder_label = false, indent_markers = { - enable = false, + enable = true, inline_arrows = true, icons = { corner = "└", @@ -143,7 +143,11 @@ nvim_tree.setup({ git = { deleted = icons.git.FileDeleted, -- ignored = icons.git.FileIgnored, - ignored = "", + -- ignored = "", + -- ignored = "", + -- ignored = "", + ignored = "", + -- ignored = icons.git.FileUnstaged, renamed = icons.git.FileRenamed, staged = icons.git.FileStaged, unmerged = icons.git.FileUnmerged, diff --git a/lua/user/options.lua b/lua/user/options.lua index 9310b88..0d00bc0 100644 --- a/lua/user/options.lua +++ b/lua/user/options.lua @@ -39,7 +39,8 @@ local options = { writebackup = false, -- Disable making a backup before overwriting a file -- minimal number of screen columns either side of cursor if wrap is `false` -- guifont = "monospace:h17", -- the font used in graphical neovim applications - guifont = "Source Code Pro:h17", -- the font used in graphical neovim applications + guifont = "SauceCodePro Nerd Font:h17", -- the font used in graphical neovim applications + -- guifont = "Hasklug Nerd Font:h16", -- the font used in graphical neovim applications -- guifont = "Hack Nerd Font:h17", -- the font used in graphical neovim applications whichwrap = "bs<>[]hl", -- which "horizontal" keys are allowed to travel to prev/next line -- which "horizontal" keys are allowed to travel to prev/next line } diff --git a/lua/user/webdevicons.lua b/lua/user/webdevicons.lua index 74cf548..7f356e1 100644 --- a/lua/user/webdevicons.lua +++ b/lua/user/webdevicons.lua @@ -11,19 +11,25 @@ material_icon.setup({ override = { ["mjs"] = { icon = "", - color = "#efd81d", + color = "#f2c55c", cterm_color = "220", name = "Mjs", }, + ["js"] = { + icon = "", + color = "#f2c55c", + cterm_color = "220", + name = "javascript", + }, ["ts"] = { icon = "󰛦", - color = "#30A2FF", + color = "#548af7", cterm_color = "220", name = "ts", }, ["jsx"] = { icon = "", - color = "#0FBFCF", + color = "#61dafb", cterm_color = "220", name = "jsx", }, @@ -47,7 +53,7 @@ material_icon.setup({ }, ["json"] = { icon = "", - color = "#ca8984", + color = "#f16421", cterm_color = "220", name = "json", }, @@ -129,11 +135,35 @@ material_icon.setup({ cterm_color = "220", name = "cfm", }, - ["cfc"] = { - icon = "", - color = "#507F89", + ["png"] = { + icon = "󰋩", + color = "#3574f0", cterm_color = "220", - name = "cfc", + name = "Png", + }, + ["jpg"] = { + icon = "󰋩", + color = "#3574f0", + cterm_color = "220", + name = "jpg", + }, + ["csv"] = { + icon = "", + color = "#57965c", + cterm_color = "220", + name = "csv", + }, + ["sql"] = { + icon = "", + color = "#b589ec", + cterm_color = "220", + name = "sqlfile", + }, + ["md"] = { + icon = "", + color = "#42a5f5", + cterm_color = "220", + name = "README_file", }, -- ["go"] = { -- icon = "󰟓",