add: update config

This commit is contained in:
asep.komarudin 2024-05-20 08:12:43 +07:00
parent 88a59af55b
commit 111556ef39
5 changed files with 19 additions and 513 deletions

View file

@ -26,58 +26,12 @@ vim.g.pcode_colorscheme = "dracula"
-- nightfox -- nightfox
-- 0 =off 1= on -- 0 =off 1= on
vim.g.pcode_transparent_mode = 0 vim.g.pcode_transparent_mode = 0
vim.g.pcode_clear_lualine = 0
-- 0 disable progress -- 0 disable progress
-- 1 lualine lsp progress -- 1 lualine lsp progress
-- 2 fidget progress -- 2 fidget progress
vim.g.pcode_progress = 1 vim.g.pcode_progress = 1
-- style -- 1 ( format jalan) 0 (fromat off)
-- 0 = default
-- 1 = { left = "", right = "" },
-- 2 = { left = " ", right = " " },
-- 3 = { left = "", right = "" },
vim.g.pcode_lualine_style = 0
-- style status icon
-- 0 = default
-- 1 = vim icon " "
-- 2 = vim icon " "
vim.g.pcode_status_icon = 0
-- start custom lualine style
-- contoh style
-- {
-- { left = "│", right = "│" },
-- { left = " ", right = " " },
-- },
-- {
-- { left = " ", right = " " },
-- { left = " ", right = "" },
-- },
-- {
-- { left = " ", right = " " },
-- { left = "", right = "" },
-- },
-- {
-- { left = "", right = "" },
-- { left = "", right = "" },
-- },
-- {
-- { left = " ", right = " " },
-- { left = "", right = "" },
-- },
-- }
vim.g.pcode_custom_lualine = true
-- vim.g.pcode_component_separators = { left = " ", right = " " }
-- vim.g.pcode_section_separators = { left = "", right = "" }
vim.g.pcode_component_separators = { left = " ", right = " " }
vim.g.pcode_section_separators = { left = "", right = "" }
-- vim.g.pcode_component_separators = { left = "│", right = "│" }
-- vim.g.pcode_component_separators = { left = "", right = "" }
-- vim.g.pcode_section_separators = { left = "", right = "" }
-- 0 ( format jalan) 1 (fromat off)
vim.g.pcode_format_on_save = 1 vim.g.pcode_format_on_save = 1
-- ini hanya untuk lsp yg tidak support masson -- ini hanya untuk lsp yg tidak support masson

View file

@ -336,7 +336,7 @@ return {
"nvim-navic", "nvim-navic",
"nvim-tree", "nvim-tree",
"nvim-web-devicons", "nvim-web-devicons",
-- "rainbow-delimiters", "rainbow-delimiters",
-- "sneak", -- "sneak",
"telescope", "telescope",
-- "trouble", -- "trouble",
@ -347,6 +347,7 @@ return {
BufferLineFill = { bg = colors.bg }, BufferLineFill = { bg = colors.bg },
StatusLine = { fg = "#f8f8f2", bg = colors.bg }, StatusLine = { fg = "#f8f8f2", bg = colors.bg },
StatusLineTerm = { fg = "#f8f8f2", bg = colors.bg }, StatusLineTerm = { fg = "#f8f8f2", bg = colors.bg },
WinBarNC = { fg = colors.fg, bg = colors.bg },
}, },
}) })
end, end,
@ -467,6 +468,7 @@ return {
-- UfoPreviewNormal = { fg = "#373d48", bg = "$bg0" }, -- UfoPreviewNormal = { fg = "#373d48", bg = "$bg0" },
-- UfoPreviewBorder = { fg = "#373d48", bg = "$bg0" }, -- UfoPreviewBorder = { fg = "#373d48", bg = "$bg0" },
-- UfoPreviewCursorLine = { fg = "#373d48", bg = "$bg0" }, -- UfoPreviewCursorLine = { fg = "#373d48", bg = "$bg0" },
WinBarNC = { fg = "$fg", bg = "NONE" },
}, },
transparent = transparent, transparent = transparent,
lualine = { lualine = {

View file

@ -1,7 +1,7 @@
return { return {
{ {
"nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
event = "InsertEnter", event = { "InsertEnter", "BufRead", "BufNewFile" },
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
@ -87,7 +87,6 @@ return {
local msg = table.concat(unique_client_names, ", ") local msg = table.concat(unique_client_names, ", ")
return msg return msg
end, end,
--icon = " ",
icon = icons.ui.Gear .. "", icon = icons.ui.Gear .. "",
padding = 1, padding = 1,
} }
@ -96,7 +95,6 @@ return {
"diagnostics", "diagnostics",
sources = { "nvim_diagnostic" }, sources = { "nvim_diagnostic" },
sections = { "error", "warn" }, sections = { "error", "warn" },
-- symbols = { error = " ", warn = " " },
symbols = { symbols = {
error = icons.diagnostics.BoldError .. " ", error = icons.diagnostics.BoldError .. " ",
warn = icons.diagnostics.BoldWarning .. " ", warn = icons.diagnostics.BoldWarning .. " ",
@ -109,17 +107,15 @@ return {
local diff = { local diff = {
"diff", "diff",
colored = true, colored = true,
-- 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 },
cond = hide_in_width, cond = hide_in_width,
} }
local spaces = function() local spaces = function()
-- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
return icons.ui.Tab .. " " .. vim.api.nvim_get_option_value(0, "shiftwidth") return icons.ui.Tab .. " " .. vim.api.nvim_get_option_value(0, "shiftwidth")
end end
@ -127,15 +123,10 @@ return {
"mode", "mode",
padding = 1, padding = 1,
separator = { left = "" }, separator = { left = "" },
-- right_padding = 3,
fmt = function(str) fmt = function(str)
return icons.ui.Neovim .. " " .. str return icons.ui.Neovim .. " " .. str
end, end,
} }
local branch = {
"branch",
padding = 1,
}
local get_branch = function() local get_branch = function()
if vim.b.gitsigns_head ~= nil then if vim.b.gitsigns_head ~= nil then
@ -150,16 +141,15 @@ return {
if data_ok then if data_ok then
lsp_progress = lspprogress.progress lsp_progress = lspprogress.progress
end end
-- 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",
@ -243,7 +233,6 @@ return {
require("lualine").setup({ require("lualine").setup({
options = { options = {
theme = bubbles_theme, theme = bubbles_theme,
-- theme = "auto",
component_separators = { left = "", right = "" }, component_separators = { left = "", right = "" },
section_separators = { left = "", right = "" }, section_separators = { left = "", right = "" },
disabled_filetypes = { disabled_filetypes = {

View file

@ -8,15 +8,6 @@ return {
require("user.alpha") require("user.alpha")
end, end,
}, },
-- line info bootom
{
"nvim-lualine/lualine.nvim",
lazy = true,
event = { "BufRead", "BufNewFile" },
config = function()
require("user.lualine_cfg")
end,
},
-- key mapping -- key mapping
{ {
"folke/which-key.nvim", "folke/which-key.nvim",

View file

@ -1,430 +0,0 @@
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 = {},
-- })