diff --git a/.config/nvim/lua/my/settings.lua b/.config/nvim/lua/my/settings.lua index cd3ef8c..0f3edb7 100644 --- a/.config/nvim/lua/my/settings.lua +++ b/.config/nvim/lua/my/settings.lua @@ -20,6 +20,7 @@ local options = { pumheight = 10, -- maximum entries in popup menu smartindent = true, -- indent after { and so on statusline = '%<%f %h%m%r%=%y %l,%c%V (%P)', + laststatus = 3, -- global statusline formatoptions = vim.o.formatoptions .. 'n', splitright = true, -- split vertical window right } diff --git a/.config/nvim/lua/my/tools.lua b/.config/nvim/lua/my/tools.lua index 07b20f3..6d282f4 100644 --- a/.config/nvim/lua/my/tools.lua +++ b/.config/nvim/lua/my/tools.lua @@ -63,40 +63,26 @@ require("nvim-tree").setup({ map('n', '', require("nvim-tree.api").tree.toggle, 'Open nvim-tree') map('i', '', require("nvim-tree.api").tree.toggle, 'Open nvim-tree') -local function over40() - return vim.fn.winwidth(0) > 40 -end - -local function over70() - return vim.fn.winwidth(0) > 70 -end - vim.o.showmode = false require('lualine').setup({ options = { icons_enabled = nerdfont_installed, component_separators = {}, section_separators = {}, - extensions = {} + extensions = {}, + globalstatus = true }, sections = { - lualine_a = { 'mode' }, - lualine_b = { { - 'branch', - icons_enabled = true, - cond = over70 - }, { - 'require("my.functions").lsp_status()', - padding = 0, - cond = over70 - }, { - 'diagnostics', - cond = over70 - } }, - lualine_c = { { 'filename', path = 1, cond = over40 } }, - lualine_x = { { 'filetype', cond = over70 } }, - lualine_y = { { 'progress', cond = over40 } }, - lualine_z = { 'location', { '"🍄"', padding = 0, cond = over40 } + lualine_a = { { 'mode' } }, + lualine_b = { + { 'branch', icons_enabled = true }, + { 'require("my.functions").lsp_status()', padding = 0 }, + { 'diagnostics' } + }, + lualine_c = { { 'filename', path = 1 } }, + lualine_x = { { 'filetype' } }, + lualine_y = { { 'progress' } }, + lualine_z = { { 'location' }, { '"🍄"', padding = 0 } } }, })