add: update config

This commit is contained in:
asep.komarudin 2024-05-12 15:18:53 +07:00
parent e6df88afa4
commit 697454eecf
7 changed files with 768 additions and 764 deletions

View file

@ -13,36 +13,35 @@
"codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" }, "codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" },
"dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" },
"friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
"github-nvim-theme": { "branch": "main", "commit": "66dcec1bd3d12f8b0bf3c885069888551a650049" },
"gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" },
"indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
"lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
"lsp-progress.nvim": { "branch": "main", "commit": "0d45f17f681c2e664238a1f6c02865760692609d" }, "lsp-progress.nvim": { "branch": "main", "commit": "0d45f17f681c2e664238a1f6c02865760692609d" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
"mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
"mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" },
"noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" },
"none-ls-extras.nvim": { "branch": "main", "commit": "c7264e9b97a051ccb955ae178b6fb3e0e9936a45" }, "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" },
"none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" }, "none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" },
"nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
"nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" }, "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" },
"nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" }, "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" },
"nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
"nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" },
"nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" }, "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" },
"nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" }, "nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
"nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" },
"nvim-tree.lua": { "branch": "master", "commit": "76db7ed0da3027882dd0a72de18643c2e26956dc" }, "nvim-tree.lua": { "branch": "master", "commit": "78c4c083ed5d47e7fab7627d78ce33d3bcfb88f0" },
"nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" }, "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" },
"nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
"nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" },
"nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
"nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
"onedarkpro.nvim": { "branch": "main", "commit": "ec07364f3cfa9cc6467bf067a490cfd74011efcd" },
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
"promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
"smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" }, "smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" },

View file

@ -17,5 +17,5 @@ require("custom.keymaps")
-- require("user.chat_gpt") -- require("user.chat_gpt")
-- vim.cmd("colorscheme one_monokai") -- vim.cmd("colorscheme one_monokai")
-- vim.cmd("colorscheme onedark") -- vim.cmd("colorscheme onedark")
-- vim.cmd("colorscheme github_dark_dimmed") vim.cmd("colorscheme github_dark_dimmed")
-- vim.cmd("colorscheme github_dark_high_contrast") -- vim.cmd("colorscheme github_dark_high_contrast")

View file

@ -1,100 +1,105 @@
return { return {
-- { {
-- "navarasu/onedark.nvim", "navarasu/onedark.nvim",
-- enabled = false, enabled = false,
-- }, },
-- { {
-- "projekt0n/github-nvim-theme", "projekt0n/github-nvim-theme",
-- lazy = false, -- make sure we load this during startup if it is your main colorscheme 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 priority = 1000, -- make sure to load this before all the other start plugins
-- config = function() config = function()
-- local is_transparent = false local is_transparent = false
-- local palette = require("github-theme.palette").load("github_dark_dimmed") local palette = require("github-theme.palette").load("github_dark_dimmed")
-- require("github-theme").setup({ require("github-theme").setup({
-- options = { options = {
-- -- Compiled file's destination location -- Compiled file's destination location
-- compile_path = vim.fn.stdpath("cache") .. "/github-theme", compile_path = vim.fn.stdpath("cache") .. "/github-theme",
-- compile_file_suffix = "_compiled", -- Compiled file suffix 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_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 hide_nc_statusline = true, -- Override the underline style for non-active statuslines
-- transparent = is_transparent, -- Disable setting background transparent = is_transparent, -- Disable setting background
-- terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal` terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal`
-- dim_inactive = false, -- Non focused panes set to alternative background dim_inactive = false, -- Non focused panes set to alternative background
-- module_default = true, -- Default enable value for modules module_default = true, -- Default enable value for modules
-- styles = { -- Style to be applied to different syntax groups styles = { -- Style to be applied to different syntax groups
-- comments = "italic", -- Value is any valid attr-list value `:help attr-list` comments = "italic", -- Value is any valid attr-list value `:help attr-list`
-- functions = "italic", functions = "italic",
-- keywords = "NONE", keywords = "NONE",
-- variables = "NONE", variables = "NONE",
-- conditionals = "NONE", conditionals = "NONE",
-- constants = "NONE", constants = "NONE",
-- numbers = "NONE", numbers = "NONE",
-- operators = "NONE", operators = "NONE",
-- strings = "NONE", strings = "NONE",
-- types = "NONE", types = "NONE",
-- }, },
-- inverse = { -- Inverse highlight for different types inverse = { -- Inverse highlight for different types
-- match_paren = false, match_paren = false,
-- visual = false, visual = false,
-- search = false, search = false,
-- }, },
-- darken = { -- Darken floating windows and sidebar-like windows darken = { -- Darken floating windows and sidebar-like windows
-- floats = false, floats = false,
-- sidebars = { sidebars = {
-- enabled = true, enabled = true,
-- list = {}, -- Apply dark background to specific windows list = {}, -- Apply dark background to specific windows
-- }, },
-- }, },
-- modules = { -- List of various plugins and additional options modules = { -- List of various plugins and additional options
-- -- ... -- ...
-- }, },
-- }, },
-- palettes = { palettes = {
-- github_dark_dimmed = { github_dark_dimmed = {
-- bg0 = is_transparent and "NONE" or "bg1", bg0 = is_transparent and "NONE" or "bg1",
-- bg1 = is_transparent and "NONE" or "bg", bg1 = is_transparent and "NONE" or "bg",
-- }, },
-- }, },
-- specs = {}, specs = {},
-- groups = { groups = {
-- all = { all = {
-- illuminatedWord = { bg = "#3b4261" }, illuminatedWord = { bg = "#3b4261" },
-- illuminatedCurWord = { bg = "#3b4261" }, illuminatedCurWord = { bg = "#3b4261" },
-- IlluminatedWordText = { bg = "#3b4261" }, IlluminatedWordText = { bg = "#3b4261" },
-- IlluminatedWordRead = { bg = "#3b4261" }, IlluminatedWordRead = { bg = "#3b4261" },
-- IlluminatedWordWrite = { bg = "#3b4261" }, IlluminatedWordWrite = { bg = "#3b4261" },
-- ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" },
-- ["@text.uri"] = { fg = palette.const, style = "italic" }, ["@text.uri"] = { fg = palette.const, style = "italic" },
-- ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, ["@keyword.return"] = { fg = "#fa7970", style = "italic" },
-- -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" },
-- -- ["@operator.html"] = { fg = "#faa356" }, -- ["@operator.html"] = { fg = "#faa356" },
-- -- ["@tag.html"] = { fg = "#fa7970" }, -- ["@tag.html"] = { fg = "#fa7970" },
-- -- ["@tag.delimiter.html"] = { fg = "#faa356" }, -- ["@tag.delimiter.html"] = { fg = "#faa356" },
-- ["@tag.javascript"] = { fg = "#faa356" }, ["@tag.javascript"] = { fg = "#faa356" },
-- ["@tag.tsx"] = { fg = "#faa356" }, ["@tag.tsx"] = { fg = "#faa356" },
-- }, },
-- github_dark_high_contrast = { github_dark_high_contrast = {
-- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
-- }, },
-- github_dark_dimmed = { github_dark_dimmed = {
-- -- As with specs and palettes, a specific style's value will be used over the `all`'s value. -- 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" }, NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
-- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
-- NvimTreeIndentMarker = { fg = "#3E4450" }, NvimTreeIndentMarker = { fg = "#3E4450" },
-- BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, BufferLineFill = { bg = is_transparent and "NONE" or "bg1" },
-- BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" },
-- LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, LualineNormal = { bg = is_transparent and "NONE" or "bg1" },
-- StatusLine = { bg = is_transparent and "NONE" or "bg1" }, StatusLine = { bg = is_transparent and "NONE" or "bg1" },
-- StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" },
-- Pmenu = { bg = is_transparent and "NONE" or "bg1" }, Pmenu = { bg = is_transparent and "NONE" or "bg1" },
-- PmenuSel = { link = "CursorLine" }, PmenuSel = { link = "CursorLine" },
-- WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" },
-- LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, LazyNormal = { bg = is_transparent and "NONE" or "bg1" },
-- LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, LazyBackground = { bg = is_transparent and "NONE" or "bg1" },
-- NormalSB = { fg = "fg1", bg = "bg1" }, -- normal text NormalSB = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, -- normal text
-- }, NormalFloat = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
-- }, IblIndent = { fg = "#3E4450" },
-- }) ["@property.lua"] = { fg = "#91cbff", bg = is_transparent and "NONE" or "bg1" },
-- end, ["@lsp.type.property.lua"] = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
-- }, ["@lsp.type.variable.lua"] = { fg = "#91cbff", bg = is_transparent and "NONE" or "bg1" },
},
},
})
end,
},
} }

View file

@ -1,290 +1,290 @@
return { return {
-- { {
-- "nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
-- event = "InsertEnter", event = "InsertEnter",
-- config = function() config = function()
-- local hide_in_width = function() local hide_in_width = function()
-- return vim.fn.winwidth(0) > 80 return vim.fn.winwidth(0) > 80
-- end end
-- local icons = require("user.icons") local icons = require("user.icons")
--
-- local getLeftSubstring = function(word, length) local getLeftSubstring = function(word, length)
-- if #word > length then if #word > length then
-- return string.sub(word, 1, length) .. "..." return string.sub(word, 1, length) .. "..."
-- else else
-- return word return word
-- end end
-- end end
--
-- -- start for lsp -- start for lsp
-- local list_registered_providers_names = function(filetype) local list_registered_providers_names = function(filetype)
-- local s = require("null-ls.sources") local s = require("null-ls.sources")
-- local available_sources = s.get_available(filetype) local available_sources = s.get_available(filetype)
-- local registered = {} local registered = {}
-- for _, source in ipairs(available_sources) do for _, source in ipairs(available_sources) do
-- for method in pairs(source.methods) do for method in pairs(source.methods) do
-- registered[method] = registered[method] or {} registered[method] = registered[method] or {}
-- table.insert(registered[method], source.name) table.insert(registered[method], source.name)
-- end end
-- end end
-- return registered return registered
-- end end
--
-- local null_ls = require("null-ls") local null_ls = require("null-ls")
-- -- for formatter -- for formatter
-- local list_registered = function(filetype) local list_registered = function(filetype)
-- local method = null_ls.methods.FORMATTING local method = null_ls.methods.FORMATTING
-- local registered_providers = list_registered_providers_names(filetype) local registered_providers = list_registered_providers_names(filetype)
-- return registered_providers[method] or {} return registered_providers[method] or {}
-- end end
--
-- --- for linter --- for linter
-- local alternative_methods = { local alternative_methods = {
-- null_ls.methods.DIAGNOSTICS, null_ls.methods.DIAGNOSTICS,
-- null_ls.methods.DIAGNOSTICS_ON_OPEN, null_ls.methods.DIAGNOSTICS_ON_OPEN,
-- null_ls.methods.DIAGNOSTICS_ON_SAVE, null_ls.methods.DIAGNOSTICS_ON_SAVE,
-- } }
--
-- local linter_list_registered = function(filetype) local linter_list_registered = function(filetype)
-- local registered_providers = list_registered_providers_names(filetype) local registered_providers = list_registered_providers_names(filetype)
-- local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m) local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m)
-- return registered_providers[m] or {} return registered_providers[m] or {}
-- end, alternative_methods)) end, alternative_methods))
--
-- return providers_for_methods return providers_for_methods
-- end end
-- -- end for lsp -- end for lsp
--
-- local lsp_info = { local lsp_info = {
-- function() function()
-- local msg = "LS Inactive" local msg = "LS Inactive"
-- local buf_ft = vim.bo.filetype local buf_ft = vim.bo.filetype
-- local clients = vim.lsp.get_active_clients() local clients = vim.lsp.get_active_clients()
-- -- start register -- start register
-- local buf_clients = vim.lsp.buf_get_clients() local buf_clients = vim.lsp.buf_get_clients()
-- local buf_client_names = {} local buf_client_names = {}
-- if next(buf_clients) == nil then if next(buf_clients) == nil then
-- -- TODO: clean up this if statement -- TODO: clean up this if statement
-- if type(msg) == "boolean" or #msg == 0 then if type(msg) == "boolean" or #msg == 0 then
-- return "LS Inactive" return "LS Inactive"
-- end end
-- return msg return msg
-- end end
-- -- add client -- add client
-- for _, client in pairs(buf_clients) do for _, client in pairs(buf_clients) do
-- if client.name ~= "null-ls" and client.name ~= "copilot" then if client.name ~= "null-ls" and client.name ~= "copilot" then
-- table.insert(buf_client_names, client.name) table.insert(buf_client_names, client.name)
-- end end
-- end end
-- -- add formatter -- add formatter
-- local supported_formatters = list_registered(buf_ft) local supported_formatters = list_registered(buf_ft)
-- vim.list_extend(buf_client_names, supported_formatters) vim.list_extend(buf_client_names, supported_formatters)
-- -- add linter -- add linter
-- local supported_linters = linter_list_registered(buf_ft) local supported_linters = linter_list_registered(buf_ft)
-- vim.list_extend(buf_client_names, supported_linters) vim.list_extend(buf_client_names, supported_linters)
-- -- decomple -- decomple
-- local unique_client_names = vim.fn.uniq(buf_client_names) local unique_client_names = vim.fn.uniq(buf_client_names)
-- local msg = table.concat(unique_client_names, ", ") local msg = table.concat(unique_client_names, ", ")
-- return msg return msg
-- end, end,
-- --icon = " ", --icon = " ",
-- icon = icons.ui.Gear .. "", icon = icons.ui.Gear .. "",
-- padding = 1, padding = 1,
-- } }
--
-- local diagnostics = { local diagnostics = {
-- "diagnostics", "diagnostics",
-- sources = { "nvim_diagnostic" }, sources = { "nvim_diagnostic" },
-- sections = { "error", "warn" }, sections = { "error", "warn" },
-- -- symbols = { error = " ", warn = " " }, -- symbols = { error = " ", warn = " " },
-- symbols = { symbols = {
-- error = icons.diagnostics.BoldError .. " ", error = icons.diagnostics.BoldError .. " ",
-- warn = icons.diagnostics.BoldWarning .. " ", warn = icons.diagnostics.BoldWarning .. " ",
-- }, },
-- colored = true, colored = true,
-- update_in_insert = false, update_in_insert = false,
-- always_visible = false, always_visible = false,
-- } }
--
-- local diff = { local diff = {
-- "diff", "diff",
-- colored = true, colored = true,
-- -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
-- symbols = { symbols = {
-- added = icons.git.LineAdded .. " ", added = icons.git.LineAdded .. " ",
-- modified = icons.git.LineModified .. " ", modified = icons.git.LineModified .. " ",
-- removed = icons.git.LineRemoved .. " ", removed = icons.git.LineRemoved .. " ",
-- }, -- changes diff symbols }, -- changes diff symbols
-- cond = hide_in_width, cond = hide_in_width,
-- } }
--
-- local spaces = function() local spaces = function()
-- -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
-- return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
-- end end
--
-- local mode = { local mode = {
-- "mode", "mode",
-- padding = 1, padding = 1,
-- separator = { left = " " }, separator = { left = "" },
-- -- right_padding = 3, -- right_padding = 3,
-- fmt = function(str) fmt = function(str)
-- return icons.ui.Neovim .. " " .. str return icons.ui.Neovim .. " " .. str
-- end, end,
-- } }
-- local branch = { local branch = {
-- "branch", "branch",
-- padding = 1, padding = 1,
-- } }
--
-- local get_branch = function() local get_branch = function()
-- if vim.b.gitsigns_head ~= nil then if vim.b.gitsigns_head ~= nil then
-- return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6) return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
-- else else
-- return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t") return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
-- end end
-- end end
--
-- local lsp_progress = {} local lsp_progress = {}
-- local data_ok, lspprogress = pcall(require, "lsp-progress") local data_ok, lspprogress = pcall(require, "lsp-progress")
-- if data_ok then if data_ok then
-- lsp_progress = lspprogress.progress lsp_progress = lspprogress.progress
-- end end
-- -- stylua: ignore -- stylua: ignore
-- local colors = { local colors = {
-- blue = '#50fa7b', blue = '#50fa7b',
-- cyan = '#f1fa8c', cyan = '#f1fa8c',
-- black = '#1a1b26', black = '#1a1b26',
-- black_transparant = 'none', black_transparant = 'none',
-- white = '#c6c6c6', white = '#c6c6c6',
-- red = "#ff757f", red = "#ff757f",
-- skyblue_1 = '#bd93f9', skyblue_1 = '#bd93f9',
-- grey = '#5f6a8e', grey = '#5f6a8e',
-- yellow = "#ffb86c", yellow = "#ffb86c",
-- fg_gutter = "#3b4261", fg_gutter = "#3b4261",
-- green1 = "#bd93f9", green1 = "#bd93f9",
-- } }
--
-- -- check config for theme -- check config for theme
-- local set_theme local set_theme
-- local bubbles_theme = {} local bubbles_theme = {}
-- local data_exists, config = pcall(require, "core.config") local data_exists, config = pcall(require, "core.config")
-- if data_exists then if data_exists then
-- if config.colorscheme ~= nil then if config.colorscheme ~= nil then
-- local color = config.colorscheme local color = config.colorscheme
-- switch(color, { switch(color, {
-- ["tokyonight"] = function() ["tokyonight"] = function()
-- set_theme = "auto" set_theme = "auto"
-- end, end,
-- ["tokyonight-night"] = function() ["tokyonight-night"] = function()
-- set_theme = "auto" set_theme = "auto"
-- end, end,
-- ["tokyonight-storm"] = function() ["tokyonight-storm"] = function()
-- set_theme = "auto" set_theme = "auto"
-- end, end,
-- ["tokyonight-day"] = function() ["tokyonight-day"] = function()
-- set_theme = "auto" set_theme = "auto"
-- end, end,
-- ["tokyonight-moon"] = function() ["tokyonight-moon"] = function()
-- set_theme = "auto" set_theme = "auto"
-- end, end,
-- ["dracula"] = function() ["dracula"] = function()
-- local clr = require("dracula").colors() local clr = require("dracula").colors()
-- colors.blue = clr.green colors.blue = clr.green
-- colors.black = clr.black colors.black = clr.black
-- colors.cyan = clr.yellow colors.cyan = clr.yellow
-- set_theme = bubbles_theme set_theme = bubbles_theme
-- end, end,
-- default = function() default = function()
-- set_theme = "auto" set_theme = "auto"
-- end, end,
-- }) })
-- end end
-- end end
--
-- bubbles_theme = { bubbles_theme = {
-- normal = { normal = {
-- a = { fg = colors.black, bg = colors.skyblue_1 }, a = { fg = colors.black, bg = colors.skyblue_1 },
-- b = { fg = colors.white, bg = colors.grey }, b = { fg = colors.white, bg = colors.grey },
-- c = { fg = colors.white, bg = colors.black_transparant }, c = { fg = colors.white, bg = colors.black_transparant },
-- }, },
--
-- insert = { insert = {
-- a = { fg = colors.black, bg = colors.blue }, a = { fg = colors.black, bg = colors.blue },
-- b = { fg = colors.blue, bg = colors.grey }, b = { fg = colors.blue, bg = colors.grey },
-- }, },
-- visual = { visual = {
-- a = { fg = colors.black, bg = colors.cyan }, a = { fg = colors.black, bg = colors.cyan },
-- b = { fg = colors.cyan, bg = colors.grey }, b = { fg = colors.cyan, bg = colors.grey },
-- }, },
-- replace = { replace = {
-- a = { bg = colors.red, fg = colors.black }, a = { bg = colors.red, fg = colors.black },
-- b = { bg = colors.fg_gutter, fg = colors.red }, b = { bg = colors.fg_gutter, fg = colors.red },
-- }, },
-- command = { command = {
-- a = { bg = colors.yellow, fg = colors.black }, a = { bg = colors.yellow, fg = colors.black },
-- b = { bg = colors.fg_gutter, fg = colors.yellow }, b = { bg = colors.fg_gutter, fg = colors.yellow },
-- }, },
-- terminal = { terminal = {
-- a = { bg = colors.green1, fg = colors.black }, a = { bg = colors.green1, fg = colors.black },
-- b = { bg = colors.fg_gutter, fg = colors.green1 }, b = { bg = colors.fg_gutter, fg = colors.green1 },
-- }, },
-- inactive = { inactive = {
-- a = { fg = colors.white, bg = colors.black_transparant }, a = { fg = colors.white, bg = colors.black_transparant },
-- b = { fg = colors.white, bg = colors.black_transparant }, b = { fg = colors.white, bg = colors.black_transparant },
-- c = { fg = colors.black, bg = colors.black_transparant }, c = { fg = colors.black, bg = colors.black_transparant },
-- }, },
-- } }
--
-- if set_theme == "auto" then if set_theme == "auto" then
-- bubbles_theme = vim.fn.fnamemodify("auto", ":t") bubbles_theme = vim.fn.fnamemodify("auto", ":t")
-- end end
--
-- require("lualine").setup({ require("lualine").setup({
-- options = { options = {
-- theme = bubbles_theme, theme = bubbles_theme,
-- -- theme = "auto", -- theme = "auto",
-- component_separators = { left = "", right = "" }, component_separators = { left = "", right = "" },
-- section_separators = { left = "", right = "" }, section_separators = { left = "", right = "" },
-- disabled_filetypes = { disabled_filetypes = {
-- "TelescopePrompt", "TelescopePrompt",
-- "packer", "packer",
-- "alpha", "alpha",
-- "dashboard", "dashboard",
-- "NvimTree", "NvimTree",
-- "Outline", "Outline",
-- "DressingInput", "DressingInput",
-- "toggleterm", "toggleterm",
-- "lazy", "lazy",
-- "mason", "mason",
-- "neo-tree", "neo-tree",
-- "startuptime", "startuptime",
-- }, },
-- always_divide_middle = true, always_divide_middle = true,
-- }, },
-- sections = { sections = {
-- lualine_a = { lualine_a = {
-- mode, mode,
-- }, },
-- lualine_b = { get_branch }, lualine_b = { get_branch },
-- lualine_c = { lsp_info, diagnostics, lsp_progress }, lualine_c = { lsp_info, diagnostics, lsp_progress },
-- lualine_x = { diff, spaces, "filetype" }, lualine_x = { diff, spaces, "filetype" },
-- lualine_y = { "progress" }, lualine_y = { "progress" },
-- lualine_z = { lualine_z = {
-- { "location", separator = { right = " " }, padding = 1 }, { "location", separator = { right = "" }, padding = 1 },
-- }, },
-- }, },
-- inactive_sections = { inactive_sections = {
-- lualine_a = { "filename" }, lualine_a = { "filename" },
-- lualine_b = {}, lualine_b = {},
-- lualine_c = {}, lualine_c = {},
-- lualine_x = {}, lualine_x = {},
-- lualine_y = {}, lualine_y = {},
-- lualine_z = { "location" }, lualine_z = { "location" },
-- }, },
-- tabline = {}, tabline = {},
-- extensions = {}, extensions = {},
-- }) })
-- end, end,
-- }, },
} }

View file

@ -1,248 +1,248 @@
return { return {
{ -- {
"nvim-lualine/lualine.nvim", -- "nvim-lualine/lualine.nvim",
event = "InsertEnter", -- event = "InsertEnter",
config = function() -- config = function()
local hide_in_width = function() -- local hide_in_width = function()
return vim.fn.winwidth(0) > 80 -- return vim.fn.winwidth(0) > 80
end -- end
local icons = require("user.icons") -- local icons = require("user.icons")
--
local getLeftSubstring = function(word, length) -- local getLeftSubstring = function(word, length)
if #word > length then -- if #word > length then
return string.sub(word, 1, length) .. "..." -- return string.sub(word, 1, length) .. "..."
else -- else
return word -- return word
end -- end
end -- end
--
-- start for lsp -- -- start for lsp
local list_registered_providers_names = function(filetype) -- local list_registered_providers_names = function(filetype)
local s = require("null-ls.sources") -- local s = require("null-ls.sources")
local available_sources = s.get_available(filetype) -- local available_sources = s.get_available(filetype)
local registered = {} -- local registered = {}
for _, source in ipairs(available_sources) do -- for _, source in ipairs(available_sources) do
for method in pairs(source.methods) do -- for method in pairs(source.methods) do
registered[method] = registered[method] or {} -- registered[method] = registered[method] or {}
table.insert(registered[method], source.name) -- table.insert(registered[method], source.name)
end -- end
end -- end
return registered -- return registered
end -- end
--
local null_ls = require("null-ls") -- local null_ls = require("null-ls")
-- for formatter -- -- for formatter
local list_registered = function(filetype) -- local list_registered = function(filetype)
local method = null_ls.methods.FORMATTING -- local method = null_ls.methods.FORMATTING
local registered_providers = list_registered_providers_names(filetype) -- local registered_providers = list_registered_providers_names(filetype)
return registered_providers[method] or {} -- return registered_providers[method] or {}
end -- end
--
--- for linter -- --- for linter
local alternative_methods = { -- local alternative_methods = {
null_ls.methods.DIAGNOSTICS, -- null_ls.methods.DIAGNOSTICS,
null_ls.methods.DIAGNOSTICS_ON_OPEN, -- null_ls.methods.DIAGNOSTICS_ON_OPEN,
null_ls.methods.DIAGNOSTICS_ON_SAVE, -- null_ls.methods.DIAGNOSTICS_ON_SAVE,
} -- }
--
local linter_list_registered = function(filetype) -- local linter_list_registered = function(filetype)
local registered_providers = list_registered_providers_names(filetype) -- local registered_providers = list_registered_providers_names(filetype)
local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m) -- local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m)
return registered_providers[m] or {} -- return registered_providers[m] or {}
end, alternative_methods)) -- end, alternative_methods))
--
return providers_for_methods -- return providers_for_methods
end -- end
-- end for lsp -- -- end for lsp
--
local lsp_info = { -- local lsp_info = {
function() -- function()
local msg = "LS Inactive" -- local msg = "LS Inactive"
local buf_ft = vim.bo.filetype -- local buf_ft = vim.bo.filetype
local clients = vim.lsp.get_active_clients() -- local clients = vim.lsp.get_active_clients()
-- start register -- -- start register
local buf_clients = vim.lsp.buf_get_clients() -- local buf_clients = vim.lsp.buf_get_clients()
local buf_client_names = {} -- local buf_client_names = {}
if next(buf_clients) == nil then -- if next(buf_clients) == nil then
-- TODO: clean up this if statement -- -- TODO: clean up this if statement
if type(msg) == "boolean" or #msg == 0 then -- if type(msg) == "boolean" or #msg == 0 then
return "LS Inactive" -- return "LS Inactive"
end -- end
return msg -- return msg
end -- end
-- add client -- -- add client
for _, client in pairs(buf_clients) do -- for _, client in pairs(buf_clients) do
if client.name ~= "null-ls" and client.name ~= "copilot" then -- if client.name ~= "null-ls" and client.name ~= "copilot" then
table.insert(buf_client_names, client.name) -- table.insert(buf_client_names, client.name)
end -- end
end -- end
-- add formatter -- -- add formatter
local supported_formatters = list_registered(buf_ft) -- local supported_formatters = list_registered(buf_ft)
vim.list_extend(buf_client_names, supported_formatters) -- vim.list_extend(buf_client_names, supported_formatters)
-- add linter -- -- add linter
local supported_linters = linter_list_registered(buf_ft) -- local supported_linters = linter_list_registered(buf_ft)
vim.list_extend(buf_client_names, supported_linters) -- vim.list_extend(buf_client_names, supported_linters)
-- decomple -- -- decomple
local unique_client_names = vim.fn.uniq(buf_client_names) -- local unique_client_names = vim.fn.uniq(buf_client_names)
local msg = table.concat(unique_client_names, ", ") -- local msg = table.concat(unique_client_names, ", ")
return msg -- return msg
end, -- end,
--icon = " ", -- --icon = " ",
icon = icons.ui.Gear .. "", -- icon = icons.ui.Gear .. "",
padding = 1, -- padding = 1,
} -- }
--
local diagnostics = { -- local diagnostics = {
"diagnostics", -- "diagnostics",
sources = { "nvim_diagnostic" }, -- sources = { "nvim_diagnostic" },
sections = { "error", "warn" }, -- sections = { "error", "warn" },
-- symbols = { error = " ", warn = " " }, -- -- symbols = { error = " ", warn = " " },
symbols = { -- symbols = {
error = icons.diagnostics.BoldError .. " ", -- error = icons.diagnostics.BoldError .. " ",
warn = icons.diagnostics.BoldWarning .. " ", -- warn = icons.diagnostics.BoldWarning .. " ",
}, -- },
colored = true, -- colored = true,
update_in_insert = false, -- update_in_insert = false,
always_visible = false, -- always_visible = false,
} -- }
--
local diff = { -- local diff = {
"diff", -- "diff",
colored = true, -- colored = true,
-- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols -- -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
symbols = { -- symbols = {
added = icons.git.LineAdded .. " ", -- added = icons.git.LineAdded .. " ",
modified = icons.git.LineModified .. " ", -- modified = icons.git.LineModified .. " ",
removed = icons.git.LineRemoved .. " ", -- removed = icons.git.LineRemoved .. " ",
}, -- changes diff symbols -- }, -- changes diff symbols
cond = hide_in_width, -- cond = hide_in_width,
} -- }
--
local spaces = function() -- local spaces = function()
-- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") -- -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") -- return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
end -- end
--
local mode = { -- local mode = {
"mode", -- "mode",
padding = 1, -- padding = 1,
separator = { left = "" }, -- separator = { left = " " },
-- right_padding = 3, -- -- right_padding = 3,
fmt = function(str) -- fmt = function(str)
return icons.ui.Neovim .. " " .. str -- return icons.ui.Neovim .. " " .. str
end, -- end,
} -- }
local branch = { -- local branch = {
"branch", -- "branch",
padding = 1, -- padding = 1,
} -- }
--
local get_branch = function() -- local get_branch = function()
if vim.b.gitsigns_head ~= nil then -- if vim.b.gitsigns_head ~= nil then
return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6) -- return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
else -- else
return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t") -- return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
end -- end
end -- end
--
local lsp_progress = {} -- local lsp_progress = {}
local data_ok, lspprogress = pcall(require, "lsp-progress") -- local data_ok, lspprogress = pcall(require, "lsp-progress")
if data_ok then -- if data_ok then
lsp_progress = lspprogress.progress -- lsp_progress = lspprogress.progress
end -- end
-- stylua: ignore -- -- stylua: ignore
local onedark=vim.fn.fnamemodify("auto", ":t") -- local onedark=vim.fn.fnamemodify("auto", ":t")
local is_transparat = true -- local is_transparat = true
local status_ok, onedarkpro = pcall(require, "onedarkpro.helpers") -- local status_ok, onedarkpro = pcall(require, "onedarkpro.helpers")
if status_ok then -- if status_ok then
local colors = onedarkpro.get_colors("onedark") -- local colors = onedarkpro.get_colors("onedark")
--
onedark = { -- onedark = {
normal = { -- normal = {
a = { bg = colors.green, fg = colors.bg }, -- a = { bg = colors.green, fg = colors.bg },
b = { bg = colors.fg_gutter, fg = colors.green }, -- b = { bg = colors.fg_gutter, fg = colors.green },
c = { -- c = {
bg = is_transparat and colors.none or colors.bg_statusline, -- bg = is_transparat and colors.none or colors.bg_statusline,
fg = colors.fg, -- fg = colors.fg,
}, -- },
}, -- },
--
insert = { -- insert = {
a = { bg = colors.blue, fg = colors.bg }, -- a = { bg = colors.blue, fg = colors.bg },
b = { bg = colors.fg_gutter, fg = colors.blue }, -- b = { bg = colors.fg_gutter, fg = colors.blue },
}, -- },
visual = { -- visual = {
a = { bg = colors.yellow, fg = colors.bg }, -- a = { bg = colors.yellow, fg = colors.bg },
b = { bg = colors.fg_gutter, fg = colors.yellow }, -- b = { bg = colors.fg_gutter, fg = colors.yellow },
}, -- },
replace = { -- replace = {
a = { bg = colors.red, fg = colors.bg }, -- a = { bg = colors.red, fg = colors.bg },
b = { bg = colors.fg_gutter, fg = colors.red }, -- b = { bg = colors.fg_gutter, fg = colors.red },
}, -- },
command = { -- command = {
a = { bg = colors.purple, fg = colors.bg }, -- a = { bg = colors.purple, fg = colors.bg },
b = { bg = colors.fg_gutter, fg = colors.purple }, -- b = { bg = colors.fg_gutter, fg = colors.purple },
}, -- },
terminal = { -- terminal = {
a = { bg = colors.cyan, fg = colors.bg }, -- a = { bg = colors.cyan, fg = colors.bg },
b = { bg = colors.fg_gutter, fg = colors.cyan }, -- b = { bg = colors.fg_gutter, fg = colors.cyan },
}, -- },
inactive = { -- inactive = {
a = { bg = colors.bg, fg = colors.blue }, -- a = { bg = colors.bg, fg = colors.blue },
b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" }, -- b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" },
c = { -- c = {
bg = is_transparat and colors.none or colors.bg, -- bg = is_transparat and colors.none or colors.bg,
fg = colors.fg_gutter_inactive, -- fg = colors.fg_gutter_inactive,
}, -- },
}, -- },
} -- }
end -- end
--
require("lualine").setup({ -- require("lualine").setup({
options = { -- options = {
theme = onedark, -- theme = onedark,
-- theme = "auto", -- -- theme = "auto",
component_separators = { left = "", right = "" }, -- component_separators = { left = "", right = "" },
section_separators = { left = "", right = "" }, -- section_separators = { left = "", right = "" },
disabled_filetypes = { -- disabled_filetypes = {
"TelescopePrompt", -- "TelescopePrompt",
"packer", -- "packer",
"alpha", -- "alpha",
"dashboard", -- "dashboard",
"NvimTree", -- "NvimTree",
"Outline", -- "Outline",
"DressingInput", -- "DressingInput",
"toggleterm", -- "toggleterm",
"lazy", -- "lazy",
"mason", -- "mason",
"neo-tree", -- "neo-tree",
"startuptime", -- "startuptime",
}, -- },
always_divide_middle = true, -- always_divide_middle = true,
}, -- },
sections = { -- sections = {
lualine_a = { -- lualine_a = {
mode, -- mode,
}, -- },
lualine_b = { get_branch }, -- lualine_b = { get_branch },
lualine_c = { lsp_info, diagnostics, lsp_progress }, -- lualine_c = { lsp_info, diagnostics, lsp_progress },
lualine_x = { diff, spaces, "filetype" }, -- lualine_x = { diff, spaces, "filetype" },
lualine_y = { "progress" }, -- lualine_y = { "progress" },
lualine_z = { -- lualine_z = {
{ "location", separator = { right = "" }, padding = 1 }, -- { "location", separator = { right = " " }, padding = 1 },
}, -- },
}, -- },
inactive_sections = { -- inactive_sections = {
lualine_a = { "filename" }, -- lualine_a = { "filename" },
lualine_b = {}, -- lualine_b = {},
lualine_c = {}, -- lualine_c = {},
lualine_x = {}, -- lualine_x = {},
lualine_y = {}, -- lualine_y = {},
lualine_z = { "location" }, -- lualine_z = { "location" },
}, -- },
tabline = {}, -- tabline = {},
extensions = {}, -- extensions = {},
}) -- })
end, -- end,
}, -- },
} }

View file

@ -1,125 +1,125 @@
return { return {
{ "navarasu/onedark.nvim", enabled = false }, -- { "navarasu/onedark.nvim", enabled = false },
{ -- {
"olimorris/onedarkpro.nvim", -- "olimorris/onedarkpro.nvim",
priority = 1000, -- Ensure it loads first -- priority = 1000, -- Ensure it loads first
config = function() -- config = function()
local is_transparent = false -- local is_transparent = false
require("onedarkpro").setup({ -- require("onedarkpro").setup({
styles = { -- styles = {
types = "NONE", -- types = "NONE",
methods = "NONE", -- methods = "NONE",
numbers = "NONE", -- numbers = "NONE",
strings = "NONE", -- strings = "NONE",
comments = "italic", -- comments = "italic",
-- keywords = "bold,italic", -- -- keywords = "bold,italic",
keywords = "italic", -- keywords = "italic",
constants = "NONE", -- constants = "NONE",
functions = "NONE", -- functions = "NONE",
operators = "NONE", -- operators = "NONE",
variables = "NONE", -- variables = "NONE",
parameters = "NONE", -- parameters = "NONE",
conditionals = "italic", -- conditionals = "italic",
virtual_text = "NONE", -- virtual_text = "NONE",
tags = "italic", -- tags = "italic",
}, -- },
colors = { -- colors = {
onedark = { -- onedark = {
green = "#99c379", -- green = "#99c379",
gray = "#8094b4", -- gray = "#8094b4",
red = "#e06c75", -- red = "#e06c75",
purple = "#c678dd", -- purple = "#c678dd",
yellow = "#e5c07a", -- yellow = "#e5c07a",
blue = "#61afef", -- blue = "#61afef",
cyan = "#56b6c2", -- cyan = "#56b6c2",
bg_statusline = "#282c34", -- bg_statusline = "#282c34",
indentline = "#3b4261", -- indentline = "#3b4261",
float_bg = "#282c34", -- float_bg = "#282c34",
}, -- },
}, -- },
filetypes = { -- filetypes = {
-- javascript = false, -- -- javascript = false,
}, -- },
options = { -- options = {
cursorline = true, -- Use cursorline highlighting? -- cursorline = true, -- Use cursorline highlighting?
transparency = is_transparent, -- Use a transparent background? -- transparency = is_transparent, -- Use a transparent background?
terminal_colors = true, -- Use the theme's colors for Neovim's :terminal? -- terminal_colors = true, -- Use the theme's colors for Neovim's :terminal?
lualine_transparency = is_transparent, -- Center bar transparency? -- lualine_transparency = is_transparent, -- Center bar transparency?
highlight_inactive_windows = false, -- When the window is out of focus, change the normal background? -- highlight_inactive_windows = false, -- When the window is out of focus, change the normal background?
}, -- },
highlights = { -- highlights = {
-- overide cursor line fill colors -- -- overide cursor line fill colors
LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. -- 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. -- CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
CursorLine = { bg = "#333842" }, -- CursorLine = { bg = "#333842" },
Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor -- 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') -- 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| -- 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. -- CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
-- overide nvimtree folder icon fill color -- -- overide nvimtree folder icon fill color
NvimTreeFolderIcon = { fg = "${gray}" }, -- NvimTreeFolderIcon = { fg = "${gray}" },
-- overide nvimtree text fill color folder opened -- -- overide nvimtree text fill color folder opened
NvimTreeOpenedFolderName = { fg = "${blue}" }, -- NvimTreeOpenedFolderName = { fg = "${blue}" },
-- overide nvimtree text fill color root folder -- -- overide nvimtree text fill color root folder
NvimTreeRootFolder = { fg = "${blue}" }, -- NvimTreeRootFolder = { fg = "${blue}" },
NvimTreeSpecialFile = { fg = "${orange}" }, -- NvimTreeSpecialFile = { fg = "${orange}" },
NvimTreeWinSeparator = { fg = "#202329" }, -- NvimTreeWinSeparator = { fg = "#202329" },
NvimTreeIndentMarker = { fg = "#3E4450" }, -- NvimTreeIndentMarker = { fg = "#3E4450" },
-- overide indenline fill color -- -- overide indenline fill color
IblIndent = { fg = "#3E4450" }, -- IblIndent = { fg = "#3E4450" },
-- overide cmp cursorline fill color with #333842 -- -- overide cmp cursorline fill color with #333842
PmenuSel = { bg = "#333842" }, -- PmenuSel = { bg = "#333842" },
illuminatedWord = { bg = "#3b4261" }, -- illuminatedWord = { bg = "#3b4261" },
illuminatedCurWord = { bg = "#3b4261" }, -- illuminatedCurWord = { bg = "#3b4261" },
IlluminatedWordText = { bg = "#3b4261" }, -- IlluminatedWordText = { bg = "#3b4261" },
IlluminatedWordRead = { bg = "#3b4261" }, -- IlluminatedWordRead = { bg = "#3b4261" },
IlluminatedWordWrite = { bg = "#3b4261" }, -- IlluminatedWordWrite = { bg = "#3b4261" },
StatusLine = { fg = "#f8f8f2", bg = is_transparent and "NONE" or "${bg}" }, -- StatusLine = { fg = "#f8f8f2", bg = is_transparent and "NONE" or "${bg}" },
StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" }, -- StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" },
BufferLineFill = { bg = is_transparent and "NONE" or "${bg}" }, -- BufferLineFill = { bg = is_transparent and "NONE" or "${bg}" },
["@string.special.url.html"] = { fg = "${green}" }, -- ["@string.special.url.html"] = { fg = "${green}" },
["@text.uri.html"] = { fg = "${green}" }, -- ["@text.uri.html"] = { fg = "${green}" },
["@tag.javascript"] = { fg = "${red}" }, -- ["@tag.javascript"] = { fg = "${red}" },
["@tag.attribute"] = { fg = "${orange}", style = "italic" }, -- ["@tag.attribute"] = { fg = "${orange}", style = "italic" },
["@constructor.javascript"] = { fg = "${red}" }, -- ["@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.builtin"] = { fg = "${red}", style = "NONE" },
["@variable.member"] = "${cyan}", -- ["@variable.member"] = "${cyan}",
["@variable.parameter"] = "${red}", -- ["@variable.parameter"] = "${red}",
-- ["@property.javascript"] = { fg = "${cyan}" }, -- similar to `@field` -- -- ["@property.javascript"] = { fg = "${cyan}" }, -- similar to `@field`
["@lsp.type.parameter"] = { fg = "${fg}" }, -- ["@lsp.type.parameter"] = { fg = "${fg}" },
["@lsp.type.property.lua"] = { fg = "${red}" }, -- ["@lsp.type.property.lua"] = { fg = "${red}" },
["@lsp.type.variable"] = { fg = "${fg}" }, -- ["@lsp.type.variable"] = { fg = "${fg}" },
NvimTreeGitDirty = { fg = "${yellow}" }, -- NvimTreeGitDirty = { fg = "${yellow}" },
Pmenu = { fg = "${fg}", bg = "${bg}" }, -- Pmenu = { fg = "${fg}", bg = "${bg}" },
PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. -- PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar.
-- overide lualine fill color with bg color -- -- overide lualine fill color with bg color
LualineNormal = { bg = "${bg}" }, -- LualineNormal = { bg = "${bg}" },
-- overide lualine_c fill color with bg color -- -- overide lualine_c fill color with bg color
LualineC = { bg = "${bg}" }, -- LualineC = { bg = "${bg}" },
-- overide lualine_x fill color with bg color -- -- overide lualine_x fill color with bg color
LualineX = { bg = "${bg}" }, -- LualineX = { bg = "${bg}" },
-- overide which-key fill color with bg color
-- WhichKey = { bg = "${bg}" },
-- -- overide which-key fill color with bg color -- -- overide which-key fill color with bg color
-- WhichKeySeperator = { bg = "${bg}" }, -- -- WhichKey = { bg = "${bg}" },
-- -- overide which-key fill color with bg color -- -- -- overide which-key fill color with bg color
-- WhichKeyDesc = { fg = "${red}" }, -- -- WhichKeySeperator = { bg = "${bg}" },
-- -- overide which-key fill color with bg color -- -- -- overide which-key fill color with bg color
-- WhichKeyFloat = { bg = "${bg}" }, -- -- WhichKeyDesc = { fg = "${red}" },
WhichKeyFloat = { bg = is_transparent and "NONE" or "${bg}" }, -- -- -- overide which-key fill color with bg color
-- -- overide which-key fill color with bg color -- -- WhichKeyFloat = { bg = "${bg}" },
-- WhichKeyValue = { bg = "${bg}" }, -- WhichKeyFloat = { bg = is_transparent and "NONE" or "${bg}" },
-- -- overide which-key fill color with bg color -- -- -- overide which-key fill color with bg color
-- WhichKeyBorder = { bg = "${bg}" }, -- -- WhichKeyValue = { bg = "${bg}" },
-- Folded = { bg = "NONE", fg = "${fg}" }, -- line used for closed folds -- -- -- overide which-key fill color with bg color
TermCursor = { bg = "${fg}" }, -- -- WhichKeyBorder = { bg = "${bg}" },
TSRainbowRed = { fg = "${cyan}" }, -- -- Folded = { bg = "NONE", fg = "${fg}" }, -- line used for closed folds
TSRainbowCyan = { fg = "${red}" }, -- TermCursor = { bg = "${fg}" },
NonText = { fg = "${fg}", bg = is_transparent and "NONE" or "#30333d" }, -- TSRainbowRed = { fg = "${cyan}" },
MiniIndentscopeSymbol = { fg = "${cyan}" }, -- TSRainbowCyan = { fg = "${red}" },
}, -- NonText = { fg = "${fg}", bg = is_transparent and "NONE" or "#30333d" },
}) -- MiniIndentscopeSymbol = { fg = "${cyan}" },
end, -- },
}, -- })
-- end,
-- },
} }

View file

@ -10,7 +10,7 @@ local rfile = {
typescript = "ts-node $dir/$fileName", -- npm install -g ts-node typescript = "ts-node $dir/$fileName", -- npm install -g ts-node
rust = "cd $dir && rustc $fileName && $dir/$fileNameWithoutExt", rust = "cd $dir && rustc $fileName && $dir/$fileNameWithoutExt",
-- cpp="gcc $fileName -lstdc++ -o $fileNameWithoutExt && $fileNameWithoutExt" -- cpp="gcc $fileName -lstdc++ -o $fileNameWithoutExt && $fileNameWithoutExt"
cpp = "g++ $fileName -o $fileNameWithoutExt && $dir/$fileNameWithoutExt", cpp = "cd $dir && g++ $fileName -o $fileNameWithoutExt && $dir/$fileNameWithoutExt",
scss = "sass $dir/$fileName $dir/$fileNameWithoutExt.css", scss = "sass $dir/$fileName $dir/$fileNameWithoutExt.css",
javascript = 'node "$dir/$fileName"', javascript = 'node "$dir/$fileName"',
} }