Skip to content

Commit 8261b35

Browse files
tiborpilztiborpilz
committed
feat(nvim): remove tmux statusline
1 parent afa9cf6 commit 8261b35

File tree

2 files changed

+113
-118
lines changed

2 files changed

+113
-118
lines changed

‎home/config/neovim/lua/plugins/statusline.lua

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
vim.g.airline_left_sep = ""
2+
vim.g.airline_right_sep = ""
3+
vim.g.airline_theme = "base16"
4+
5+
return {
6+
-- Status line
7+
{
8+
'nvim-lualine/lualine.nvim',
9+
dependencies = { 'nvim-tree/nvim-web-devicons' },
10+
config = function()
11+
-- TODO: This doesn't work, setting the background via nord theme override
12+
vim.cmd [[ hi lualine_c_normal guibg=NONE ]]
13+
14+
local nord_theme_custom = require('lualine.themes.nord')
15+
nord_theme_custom.normal.c.bg = 'none'
16+
-- nord_theme_custom.normal.c.fg = 'darker_white'
17+
nord_theme_custom.inactive.c.bg = 'none'
18+
19+
local mode_map = {
20+
['NORMAL'] = 'N',
21+
['O-PENDING'] = 'N?',
22+
['INSERT'] = 'I',
23+
['VISUAL'] = 'V',
24+
['V-BLOCK'] = 'VB',
25+
['V-LINE'] = 'VL',
26+
['V-REPLACE'] = 'VR',
27+
['REPLACE'] = 'R',
28+
['COMMAND'] = '!',
29+
['SHELL'] = 'SH',
30+
['TERMINAL'] = 'T',
31+
['EX'] = 'X',
32+
['S-BLOCK'] = 'SB',
33+
['S-LINE'] = 'SL',
34+
['SELECT'] = 'S',
35+
['CONFIRM'] = 'Y?',
36+
['MORE'] = 'M',
37+
}
38+
39+
require('lualine').setup({
40+
options = {
41+
theme = nord_theme_custom,
42+
section_separators = { left = ' ', right = ' ' },
43+
component_separators = { left = ' ', right = ' ' },
44+
globalstatus = true,
45+
},
46+
sections = {
47+
lualine_a = {},
48+
lualine_b = {},
49+
lualine_c = {},
50+
lualine_x = {
51+
'overseer',
52+
{
53+
'diagnostics',
54+
55+
sources = { 'nvim_lsp', 'nvim_diagnostic' },
56+
sections = { 'error', 'warn', 'info', 'hint' },
57+
58+
diagnostics_color = {
59+
error = 'DiagnosticError', -- Changes diagnostics' error color.
60+
info = 'DiagnosticInfo', -- Changes diagnostics' info color.
61+
hint = 'DiagnosticHint', -- Changes diagnostics' hint color.
62+
},
63+
-- symbols = { error = '', warn = '', info = '', hint = '' },
64+
symbols = { error = '', warn = '', info = '' },
65+
colored = true, -- Displays diagnostics status in color if set to true.
66+
update_in_insert = true, -- Update diagnostics in insert mode.
67+
always_visible = false, -- Show diagnostics even if there are none.
68+
},
69+
{
70+
'filename',
71+
path = 1,
72+
symbols = {
73+
modified = '',
74+
readonly = '',
75+
unnamed = '',
76+
newfile = '',
77+
},
78+
},
79+
{
80+
'filetype',
81+
colored = true,
82+
icon_only = true,
83+
},
84+
},
85+
lualine_y = {
86+
{ 'b:gitsigns_head', icon = '' },
87+
},
88+
lualine_z = {
89+
{
90+
'mode',
91+
fmt = function(mode)
92+
return mode_map[mode] or mode
93+
end,
94+
},
95+
},
96+
},
97+
inactive_sections = {
98+
lualine_a = {},
99+
lualine_b = {},
100+
lualine_c = {},
101+
lualine_x = {},
102+
lualine_y = { 'filename' },
103+
lualine_z = {},
104+
},
105+
extensions = {
106+
'nvim-tree',
107+
'mason',
108+
'lazy',
109+
},
110+
})
111+
end,
112+
},
113+
}

‎home/config/neovim/lua/plugins/ui.lua

Lines changed: 0 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
vim.g.airline_left_sep = ""
2-
vim.g.airline_right_sep = ""
3-
vim.g.airline_theme = "base16"
4-
51
-- Diagnostic Settings
62
vim.fn.sign_define("DiagnosticSignError", { text = "", texthl = "DiagnosticSignError" })
73
vim.fn.sign_define("DiagnosticSignWarn", { text = "", texthl = "DiagnosticSignWarn" })
@@ -22,120 +18,6 @@ return {
2218
})
2319
end,
2420
},
25-
-- Status line
26-
{
27-
'nvim-lualine/lualine.nvim',
28-
dependencies = { 'nvim-tree/nvim-web-devicons' },
29-
config = function()
30-
-- TODO: This doesn't work, setting the background via nord theme override
31-
vim.cmd [[ hi lualine_c_normal guibg=NONE ]]
32-
33-
local nord_theme_custom = require('lualine.themes.nord')
34-
nord_theme_custom.normal.c.bg = 'none'
35-
-- nord_theme_custom.normal.c.fg = 'darker_white'
36-
nord_theme_custom.inactive.c.bg = 'none'
37-
38-
local mode_map = {
39-
['NORMAL'] = 'N',
40-
['O-PENDING'] = 'N?',
41-
['INSERT'] = 'I',
42-
['VISUAL'] = 'V',
43-
['V-BLOCK'] = 'VB',
44-
['V-LINE'] = 'VL',
45-
['V-REPLACE'] = 'VR',
46-
['REPLACE'] = 'R',
47-
['COMMAND'] = '!',
48-
['SHELL'] = 'SH',
49-
['TERMINAL'] = 'T',
50-
['EX'] = 'X',
51-
['S-BLOCK'] = 'SB',
52-
['S-LINE'] = 'SL',
53-
['SELECT'] = 'S',
54-
['CONFIRM'] = 'Y?',
55-
['MORE'] = 'M',
56-
}
57-
58-
require('lualine').setup({
59-
options = {
60-
theme = nord_theme_custom,
61-
section_separators = { left = ' ', right = ' ' },
62-
component_separators = { left = ' ', right = ' ' },
63-
globalstatus = true,
64-
},
65-
sections = {
66-
lualine_a = {},
67-
lualine_b = {},
68-
lualine_c = {},
69-
lualine_x = {
70-
'overseer',
71-
{
72-
'diagnostics',
73-
74-
sources = { 'nvim_lsp', 'nvim_diagnostic' },
75-
sections = { 'error', 'warn', 'info', 'hint' },
76-
77-
diagnostics_color = {
78-
error = 'DiagnosticError', -- Changes diagnostics' error color.
79-
info = 'DiagnosticInfo', -- Changes diagnostics' info color.
80-
hint = 'DiagnosticHint', -- Changes diagnostics' hint color.
81-
},
82-
-- symbols = { error = '', warn = '', info = '', hint = '' },
83-
symbols = { error = '', warn = '', info = '' },
84-
colored = true, -- Displays diagnostics status in color if set to true.
85-
update_in_insert = true, -- Update diagnostics in insert mode.
86-
always_visible = false, -- Show diagnostics even if there are none.
87-
},
88-
{
89-
'filename',
90-
path = 1,
91-
symbols = {
92-
modified = '',
93-
readonly = '',
94-
unnamed = '',
95-
newfile = '',
96-
},
97-
},
98-
{
99-
'filetype',
100-
colored = true,
101-
icon_only = true,
102-
},
103-
},
104-
lualine_y = {
105-
{ 'b:gitsigns_head', icon = '' },
106-
},
107-
lualine_z = {
108-
{
109-
'mode',
110-
fmt = function(mode)
111-
return mode_map[mode] or mode
112-
end,
113-
},
114-
},
115-
},
116-
inactive_sections = {
117-
lualine_a = {},
118-
lualine_b = {},
119-
lualine_c = {},
120-
lualine_x = {},
121-
lualine_y = { 'filename' },
122-
lualine_z = {},
123-
},
124-
extensions = {
125-
'nvim-tree',
126-
'mason',
127-
'lazy',
128-
},
129-
})
130-
end,
131-
},
132-
133-
-- Status line in Tmux
134-
{
135-
"vimpostor/vim-tpipeline",
136-
event = "VeryLazy",
137-
},
138-
13921
-- Status Column
14022
{
14123
"lewis6991/gitsigns.nvim",

0 commit comments

Comments
 (0)