diff --git a/lazy-lock.json b/lazy-lock.json index e7be810..1f28393 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -31,7 +31,8 @@ "mini.pairs": { "branch": "main", "commit": "fec9aba50912d8c3d92d07d6a77952de84f8d7ad" }, "mini.surround": { "branch": "main", "commit": "df41f1c009afbb3eef39d979977fb14404576f9b" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, - "nui.nvim": { "branch": "main", "commit": "b99e6cb13dc51768abc1c4c8585045a0c0459ef1" }, + "nord-vim": { "branch": "main", "commit": "2272dcf8ef7d6c1f13a5a1a86a23906dc0c6b39e" }, + "nui.nvim": { "branch": "main", "commit": "d147222a1300901656f3ebd5b95f91732785a329" }, "null-ls.nvim": { "branch": "main", "commit": "c0c19f32b614b3921e17886c541c13a72748d450" }, "nvim-autopairs": { "branch": "master", "commit": "4fc96c8f3df89b6d23e5092d31c866c53a346347" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index f73eab8..d7592ee 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -28,7 +28,7 @@ return { end, }, -- { "lunarvim/lunar.nvim" }, - -- { "arcticicestudio/nord-vim" }, + { "arcticicestudio/nord-vim" }, -- { -- "catppuccin/nvim", -- name = "catppuccin", diff --git a/lua/user/lualine.lua b/lua/user/lualine.lua index f692e7d..3fe46ed 100644 --- a/lua/user/lualine.lua +++ b/lua/user/lualine.lua @@ -181,6 +181,8 @@ lualine.setup({ -- section_separators = { left = "", right = "" }, -- component_separators = { left = "", right = "" }, -- section_separators = { left = " ", right = " " }, + -- component_separators = { left = "", right = "" }, + -- section_separators = { left = "", right = "" }, disabled_filetypes = { "TelescopePrompt", diff --git a/lua/user/lualine3.lua b/lua/user/lualine3.lua new file mode 100644 index 0000000..c69ffbd --- /dev/null +++ b/lua/user/lualine3.lua @@ -0,0 +1,221 @@ +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, +} + +local mode = { + "mode", + fmt = function(str) + return "--" .. str .. "--" + -- return " " .. str + -- return " " .. str + end, +} + +local filetype = { + "filetype", + icons_enabled = true, + icon = nil, +} + +local branch = { + "branch", + icons_enabled = true, + --icon = "", + icon = icons.git.Branch, +} + +local location = { + "location", + padding = 0, +} + +-- 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 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 .. "", +} + +lualine.setup({ + options = { + icons_enabled = true, + theme = "auto", + -- component_separators = { left = "", right = "" }, + -- section_separators = { left = "", right = "" }, + -- component_separators = { left = "", right = "" }, + -- section_separators = { left = "", right = "" }, + -- component_separators = { left = "", right = "" }, + -- section_separators = { left = " ", right = " " }, + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + + disabled_filetypes = { + "TelescopePrompt", + "packer", + "alpha", + "dashboard", + "NvimTree", + "Outline", + "DressingInput", + "toggleterm", + "lazy", + "mason", + }, + always_divide_middle = true, + }, + sections = { + lualine_a = { branch }, + lualine_b = { mode }, + lualine_c = { diagnostics, lsp_info }, + -- lualine_c = { file_name, lsp_info }, + -- lualine_x = { "encoding", "fileformat", "filetype" }, + lualine_x = { diff, spaces, "encoding", filetype }, + lualine_y = { location }, + lualine_z = { progress }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + extensions = {}, +})