Switch to new scheme, lualine

This commit is contained in:
Alex Yatskov 2022-12-22 15:51:53 -08:00
parent b22c836cbb
commit 62743165bf
8 changed files with 51 additions and 33 deletions

15
.gitmodules vendored
View File

@ -31,12 +31,6 @@
[submodule ".vim/bundle/vim-interestingwords"]
path = pack/plugins/start/vim-interestingwords
url = https://github.com/vasconcelloslf/vim-interestingwords.git
[submodule ".vim/bundle/vim-airline-themes"]
path = pack/plugins/start/vim-airline-themes
url = https://github.com/vim-airline/vim-airline-themes.git
[submodule ".vim/bundle/vim-airline"]
path = pack/plugins/start/vim-airline
url = https://github.com/vim-airline/vim-airline.git
[submodule ".vim/bundle/vim-dirvish"]
path = pack/plugins/start/vim-dirvish
url = https://github.com/justinmk/vim-dirvish.git
@ -49,9 +43,6 @@
[submodule ".vim/bundle/vim-angry"]
path = pack/plugins/start/vim-angry
url = https://github.com/b4winckler/vim-angry.git
[submodule ".vim/bundle/vim-solarized8"]
path = pack/plugins/start/vim-solarized8
url = https://github.com/lifepillar/vim-solarized8.git
[submodule ".vim/pack/plugins/start/vim-fugitive"]
path = pack/plugins/start/vim-fugitive
url = https://github.com/tpope/vim-fugitive.git
@ -97,3 +88,9 @@
[submodule "pack/plugins/start/cmp-nvim-lsp-signature-help"]
path = pack/plugins/start/cmp-nvim-lsp-signature-help
url = https://github.com/hrsh7th/cmp-nvim-lsp-signature-help.git
[submodule "pack/plugins/start/nightfox.nvim"]
path = pack/plugins/start/nightfox.nvim
url = https://github.com/EdenEast/nightfox.nvim.git
[submodule "pack/plugins/start/lualine.nvim"]
path = pack/plugins/start/lualine.nvim
url = https://github.com/nvim-lualine/lualine.nvim.git

View File

@ -1,5 +1,5 @@
-- colors
vim.cmd.colorscheme('solarized8')
vim.cmd.colorscheme('nightfox')
-- leader
vim.g.mapleader = ' '

View File

@ -6,36 +6,58 @@ if vim.fn.executable('fzf') then
vim.keymap.set('n', '<leader>fh', vim.cmd.History)
vim.keymap.set('n', '<leader>fb', vim.cmd.Buffers)
vim.keymap.set('n', '<leader>fl', vim.cmd.Lines)
vim.g.fzf_colors = {
['bg'] = {'bg', 'Normal'},
['bg+'] = {'bg', 'CursorLine', 'CursorColumn'},
['border'] = {'fg', 'Ignore'},
['fg'] = {'fg', 'Normal'},
['fg+'] = {'fg', 'CursorLine', 'CursorColumn', 'Normal'},
['header'] = {'fg', 'Comment'},
['hl'] = {'fg', 'Comment'},
['hl+'] = {'fg', 'Statement'},
['info'] = {'fg', 'PreProc'},
['marker'] = {'fg', 'Keyword'},
['pointer'] = {'fg', 'Exception'},
['prompt'] = {'fg', 'Conditional'},
['spinner'] = {'fg', 'Label'},
}
end
-- hflip.nvim
vim.keymap.set('n', 'gfs', vim.cmd.HFlip)
-- vim-airline
vim.g['airline#extensions#tabline#enabled'] = 1
vim.g['airline_symbols_ascii'] = 1
-- lualine.nvim
require('lualine').setup {
options = {
always_divide_middle = true,
component_separators = {left = '', right = ''},
disabled_filetypes = {statusline = {}, winbar = {}},
globalstatus = false,
icons_enabled = false,
ignore_focus = {},
refresh = {statusline = 1000, tabline = 1000, winbar = 1000},
section_separators = {left = '', right = ''},
theme = 'auto',
},
sections = {
lualine_a = {'mode'},
lualine_b = {'branch', 'diff', 'diagnostics'},
lualine_c = {'filename'},
lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_y = {'progress'},
lualine_z = {'location'}
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = {'filename'},
lualine_x = {'location'},
lualine_y = {},
lualine_z = {}
},
tabline = {
lualine_a = {'buffers'},
lualine_b = {},
lualine_c = {},
lualine_x = {},
lualine_y = {},
lualine_z = {}
},
winbar = {},
inactive_winbar = {},
extensions = {}
}
-- vim-argwrap
vim.keymap.set('n', '<leader>a', vim.cmd.ArgWrap)
-- vim-better-whitespace
vim.api.nvim_set_hl(0, 'ExtraWhitespace', { bg = '#6c71c4' })
vim.api.nvim_set_hl(0, 'ExtraWhitespace', {link = 'Search'})
-- vim-dirvish
vim.g.dirvish_mode = ':sort ,^.*[\\/],'

@ -0,0 +1 @@
Subproject commit fffbcb829288c3ca366f17cdb8d46aefb5c1d6f3

@ -0,0 +1 @@
Subproject commit 9c3756ae21743c9634923cea788c4cca0eafccf2

@ -1 +0,0 @@
Subproject commit 6a4c82c950cc10388117e927b89a72a557e5944c

@ -1 +0,0 @@
Subproject commit dd81554c2231e438f6d0e8056ea38fd0e80ac02a

@ -1 +0,0 @@
Subproject commit 9f9b7951975012ce51766356c7c28ba56294f9e8