From ef9585343387f7be1ebab43f4b2b367261588526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= Date: Sat, 22 Mar 2025 11:20:09 +0100 Subject: [PATCH] nvim: replace feline with slimline and incline plugin display only bottom status line --- nvim/.config/nvim/lazy-lock.json | 3 +- nvim/.config/nvim/lua/lupan/autocmd.lua | 8 - nvim/.config/nvim/lua/lupan/options.lua | 2 + nvim/.config/nvim/lua/plugins/feline.lua | 235 ----------------------- nvim/.config/nvim/lua/plugins/line.lua | 15 ++ 5 files changed, 19 insertions(+), 244 deletions(-) delete mode 100644 nvim/.config/nvim/lua/plugins/feline.lua create mode 100644 nvim/.config/nvim/lua/plugins/line.lua diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 5e729a0..9570890 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -8,7 +8,6 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "feline.nvim": { "branch": "main", "commit": "c97c17dc56ca3cf2b9b9192c3447fc59347e8c0d" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, @@ -17,6 +16,7 @@ "godoc.nvim": { "branch": "main", "commit": "0163dd1f4695ef6bed8ad72336b96e08f31018a0" }, "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" }, "hlsearch.nvim": { "branch": "main", "commit": "fdeb60b890d15d9194e8600042e5232ef8c29b0e" }, + "incline.nvim": { "branch": "main", "commit": "0eb5b7f6fc6636a4e7b2eb2800b7650fd6d164a2" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "iswap.nvim": { "branch": "master", "commit": "e02cc91f2a8feb5c5a595767d208c54b6e3258ec" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, @@ -44,6 +44,7 @@ "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "quicker.nvim": { "branch": "master", "commit": "1798be71cdcb15fb84fa8054148a56e17fd391dc" }, "rabbit.nvim": { "branch": "master", "commit": "3a4ce048b8ecc48811d061220d0e86111adda20d" }, + "slimline.nvim": { "branch": "main", "commit": "326514876f6e5c051a7a2bf1e926659a74500016" }, "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" }, "tardis.nvim": { "branch": "main", "commit": "a6ee00a217529490e79d349b1f1a9cf5831180d3" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, diff --git a/nvim/.config/nvim/lua/lupan/autocmd.lua b/nvim/.config/nvim/lua/lupan/autocmd.lua index 77436cb..66243e0 100644 --- a/nvim/.config/nvim/lua/lupan/autocmd.lua +++ b/nvim/.config/nvim/lua/lupan/autocmd.lua @@ -16,11 +16,3 @@ vim.api.nvim_create_autocmd('BufWritePre', { group = vim.api.nvim_create_augroup('BufWriteFormat', { clear = true }), pattern = { '*.go', '*.lua', '*.rs' }, }) - -vim.api.nvim_create_autocmd('ColorScheme', { - desc = 'Change feline theme', - group = vim.api.nvim_create_augroup('ChangeFelineTheme', { clear = true }), - callback = function() - require('feline').use_theme(vim.o.background) - end, -}) diff --git a/nvim/.config/nvim/lua/lupan/options.lua b/nvim/.config/nvim/lua/lupan/options.lua index a90b82d..303b07d 100644 --- a/nvim/.config/nvim/lua/lupan/options.lua +++ b/nvim/.config/nvim/lua/lupan/options.lua @@ -52,3 +52,5 @@ vim.g.lightspeed_no_default_keymaps = true vim.o.cursorline = true vim.opt.foldcolumn = '1' + +vim.opt.laststatus = 3 diff --git a/nvim/.config/nvim/lua/plugins/feline.lua b/nvim/.config/nvim/lua/plugins/feline.lua deleted file mode 100644 index f13a7b3..0000000 --- a/nvim/.config/nvim/lua/plugins/feline.lua +++ /dev/null @@ -1,235 +0,0 @@ -local function feline_config(_, opts) - local feline = require('feline') - - local dark_theme = { - bg = '#5a605f', - bg2 = '#2b3231', - black = '#403833', - skyblue = '#61abda', - cyan = '#65b8c1', - fg = '#9bafac', - green = '#8bae68', - oceanblue = '#6099c0', - magenta = '#cf86c1', - orange = '#d68c67', - red = '#e8838f', - violet = '#b279a7', - white = '#b4bdc3', - yellow = '#b77e64', - } - feline.add_theme('dark', dark_theme) - - local light_theme = { - bg = '#dde4e3', - bg2 = '#b3cbc8', - black = '#c4b6af', - skyblue = '#1d5573', - cyan = '#2b747c', - fg = '#2c3131', - green = '#3f5a22', - oceanblue = '#286486', - magenta = '#7b3b70', - orange = '#803d1c', - red = '#94253e', - violet = '#88507d', - white = '#4f5e68', - yellow = '#944927', - } - feline.add_theme('light', light_theme) - - local vimode = require('feline.providers.vi_mode') - local c = { - vi_mode = { - provider = 'vi_mode', - hl = function() - return { - name = vimode.get_mode_highlight_name(), - fg = vimode.get_mode_color(), - bg = 'bg2', - style = 'bold', - } - end, - left_sep = { - str = ' █', - always_visible = true, - hl = { - fg = 'bg2', - }, - }, - right_sep = { - str = '', - always_visible = true, - hl = { - fg = 'bg2', - }, - } - }, - file_info = { - provider = 'file_info', - hl = { - fg = 'fg', - }, - left_sep = { - str = ' ', - }, - right_sep = { - str = ' ', - }, - }, - file_size = { - provider = 'file_size', - hl = { - fg = 'fg', - bg = 'bg2', - style = 'bold', - }, - left_sep = { - str = ' █', - always_visible = true, - hl = { - fg = 'bg2', - }, - }, - }, - line_percentage = { - provider = 'line_percentage', - hl = { - fg = 'fg', - bg = 'bg2', - style = 'bold', - }, - left_sep = { - str = ' │ ', - hl = { - fg = 'fg', - bg = 'bg2', - }, - }, - right_sep = { - str = ' │ ', - hl = { - fg = 'fg', - bg = 'bg2', - }, - }, - }, - position = { - provider = 'position', - hl = { - fg = 'fg', - bg = 'bg2', - style = 'bold', - }, - right_sep = { - str = '█ ', - always_visible = true, - hl = { - fg = 'bg2', - }, - } - }, - - diagnostic_errors = { - provider = 'diagnostic_errors', - hl = { - fg = 'red', - }, - }, - diagnostic_warnings = { - provider = 'diagnostic_warnings', - hl = { - fg = 'yellow', - }, - }, - diagnostic_hints = { - provider = 'diagnostic_hints', - hl = { - fg = 'cyan', - }, - }, - diagnostic_info = { - provider = 'diagnostic_info', - hl = { - fg = 'skyblue', - }, - }, - - git_diff_added = { - provider = 'git_diff_added', - hl = { - fg = 'green', - }, - }, - git_diff_removed = { - provider = 'git_diff_removed', - hl = { - fg = 'red', - }, - }, - git_diff_changed = { - provider = 'git_diff_changed', - hl = { - fg = 'yellow', - }, - }, - git_branch = { - provider = 'git_branch', - hl = { - fg = 'fg', - bg = 'bg2', - style = 'bold', - }, - left_sep = { - str = ' █', - hl = { - fg = 'bg2', - }, - }, - right_sep = { - str = ' ', - hl = { - fg = 'bg2', - }, - } - }, - } - - local active = { - { - c.vi_mode, - c.file_info, - c.arrow, - c.file_size, - c.line_percentage, - c.position, - c.diagnostic_errors, - c.diagnostic_warnings, - c.diagnostic_info, - c.diagnostic_hints, - }, - { - c.git_diff_added, - c.git_diff_removed, - c.git_diff_changed, - c.git_branch, - }, - } - - local inactive = { - { - c.file_info, - }, - {}, - } - - opts.components = { active = active, inactive = inactive } - feline.setup(opts) - feline.use_theme(require('lupan.utils').terminalbg()) -end - -return { - -- Statusline - 'freddiehaddad/feline.nvim', - opts = {}, - config = feline_config, -} diff --git a/nvim/.config/nvim/lua/plugins/line.lua b/nvim/.config/nvim/lua/plugins/line.lua new file mode 100644 index 0000000..bff728d --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/line.lua @@ -0,0 +1,15 @@ +return { + { + "sschleemilch/slimline.nvim", + opts = {} + }, + + { + 'b0o/incline.nvim', + config = function() + require('incline').setup() + end, + -- Optional: Lazy load Incline + event = 'VeryLazy', + }, +}