diff --git a/init.lua b/init.lua index 530f812..e4d8715 100644 --- a/init.lua +++ b/init.lua @@ -14,6 +14,8 @@ vim.diagnostic.config({ -- add plugins vim.pack.add({ "https://github.com/nvim-treesitter/nvim-treesitter", + "https://github.com/nvim-lualine/lualine.nvim", + "https://github.com/RRethy/base16-nvim", "https://github.com/tinted-theming/tinted-nvim.git", "https://github.com/neovim/nvim-lspconfig", "https://github.com/vyfor/cord.nvim", @@ -22,23 +24,12 @@ vim.pack.add({ -- function to set colorsceme require('tinted-nvim').setup({ ui = { - transparent = true + transparent = false }, highlights = { - overrides = function(palette) - return { - MiniStatuslineModeNormal = { fg = palette.base00, bg = palette.base0D, bold = true }, - MiniStatuslineModeInsert = { fg = palette.base00, bg = palette.base0B, bold = true }, - MiniStatuslineModeVisual = { fg = palette.base00, bg = palette.base0E, bold = true }, - MiniStatuslineModeReplace = { fg = palette.base00, bg = palette.base08, bold = true }, - MiniStatuslineModeCommand = { fg = palette.base00, bg = palette.base0A, bold = true }, - MiniStatuslineModeOther = { fg = palette.base00, bg = palette.base0C, bold = true }, - MiniStatuslineDevinfo = { fg = palette.base05, bg = palette.base02 }, - MiniStatuslineFilename = { fg = palette.base04, bg = palette.base01 }, - MiniStatuslineFileinfo = { fg = palette.base05, bg = palette.base02 }, - MiniStatuslineInactive = { fg = palette.base03, bg = palette.base01 }, - } - end, + integrations = { + lualine = true + } } }) vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme")) @@ -47,39 +38,31 @@ require('mini.basics').setup() require('mini.icons').setup() require('mini.pick').setup() require('mini.git').setup() -require('mini.statusline').setup({ - content = { - active = function() - local function lsp_names() - local clients = vim.lsp.get_clients({ bufnr = 0 }) - if #clients == 0 then - return "" - end - - local names = {} - for _, client in ipairs(clients) do - table.insert(names, client.name) - end - return "󰒋 " .. table.concat(names, ", ") - end - local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 }) - local git = MiniStatusline.section_git({ trunc_width = 40 }) - local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 }) - local filename = MiniStatusline.section_filename({ trunc_width = 140 }) - local location = MiniStatusline.section_location({ trunc_width = 10000 }) - - return MiniStatusline.combine_groups({ - { hl = mode_hl, strings = { mode } }, - { hl = 'MiniStatuslineDevinfo', strings = { git, diagnostics, filename } }, - '%<', -- Mark general truncate point - '%=', -- End left alignment - { hl = 'MiniStatusLineDevIndo', strings = { lsp_names() } }, - { hl = mode_hl, strings = { location } }, - }) - end +require("lualine").setup({ + options = { + section_separators = { left = "", right = "" }, + component_separators = { left = "|", right = "|" }, + globalstatus = true, + always_divide_middle = true, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "diagnostics" }, + lualine_c = { "filename", "filesize", }, + lualine_x = { "lsp_status", "filetype" }, + lualine_y = { "" }, + lualine_z = { "location" }, + }, + tabline = { + lualine_a = { { 'buffers', mode = 2, show_modified_status = true, } }, + lualine_b = { 'branch' }, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { 'tabs' } } - }) + -- setup superior lsp vim.lsp.config("qml-language-server", { cmd = { "qml-language-server" },