diff options
| -rw-r--r-- | init.vim | 4 | ||||
| -rw-r--r-- | lua/galaxy-line.lua | 191 | ||||
| -rw-r--r-- | lua/web-devicons-config.lua | 1 | ||||
| -rw-r--r-- | themes/airline.vim | 2 | ||||
| -rw-r--r-- | themes/nvcode.vim | 3 | ||||
| -rw-r--r-- | vim-plug/plugins.vim | 3 |
6 files changed, 197 insertions, 7 deletions
@@ -24,7 +24,7 @@ else " Themes source $HOME/.config/nvim/themes/syntax.vim source $HOME/.config/nvim/themes/nvcode.vim - source $HOME/.config/nvim/themes/airline.vim + " source $HOME/.config/nvim/themes/airline.vim " Plugin Configuration source $HOME/.config/nvim/keys/which-key.vim @@ -34,7 +34,7 @@ else source $HOME/.config/nvim/plug-config/fzf.vim source $HOME/.config/nvim/plug-config/codi.vim source $HOME/.config/nvim/plug-config/vim-wiki.vim - luafile $HOME/.config/nvim/lua/web-devicons-config.lua + luafile $HOME/.config/nvim/lua/galaxy-line.lua luafile $HOME/.config/nvim/lua/treesitter.lua source $HOME/.config/nvim/plug-config/coc.vim source $HOME/.config/nvim/plug-config/easymotion.vim diff --git a/lua/galaxy-line.lua b/lua/galaxy-line.lua new file mode 100644 index 00000000..cd7481d2 --- /dev/null +++ b/lua/galaxy-line.lua @@ -0,0 +1,191 @@ +-- require'nvim-web-devicons'.setup() + +local gl = require('galaxyline') +local gls = gl.section +gl.short_line_list = {'LuaTree','vista','dbui'} + +local colors = { + bg = '#282c34', + yellow = '#fabd2f', + cyan = '#008080', + darkblue = '#081633', + green = '#afd700', + orange = '#FF8800', + purple = '#5d4d7a', + magenta = '#d16d9e', + grey = '#c0c0c0', + blue = '#0087d7', + red = '#ec5f67' +} + +local buffer_not_empty = function() + if vim.fn.empty(vim.fn.expand('%:t')) ~= 1 then + return true + end + return false +end + +gls.left[1] = { + FirstElement = { + -- provider = function() return '▋' end, + provider = function() return ' ' end, + highlight = {colors.bg,colors.purple} + }, +} +gls.left[2] = { + ViMode = { + provider = function() + local alias = {n = 'NORMAL',i = 'INSERT',c= 'COMMAND',V= 'VISUAL', [''] = 'VISUAL'} + return alias[vim.fn.mode()] + end, + separator = ' ', + separator_highlight = {colors.yellow,function() + if not buffer_not_empty() then + return colors.purple + end + return colors.purple + end}, + highlight = {colors.grey,colors.purple,'bold'}, + }, +} +-- gls.left[3] ={ +-- FileIcon = { +-- separator = ' ', +-- provider = 'FileIcon', +-- condition = buffer_not_empty, +-- highlight = {require('galaxyline.provider_fileinfo').get_file_icon_color,colors.bg}, +-- }, +-- } +-- gls.left[4] = { +-- FileName = { +-- provider = {'FileSize'}, +-- condition = buffer_not_empty, +-- separator = ' ', +-- separator_highlight = {colors.purple,colors.bg}, +-- highlight = {colors.magenta,colors.bg} +-- } +-- } + +gls.left[5] = { + GitIcon = { + provider = function() return ' ' end, + condition = buffer_not_empty, + highlight = {colors.orange,colors.bg}, + } +} +gls.left[6] = { + GitBranch = { + provider = 'GitBranch', + condition = buffer_not_empty, + highlight = {colors.grey,colors.bg}, + } +} + +local checkwidth = function() + local squeeze_width = vim.fn.winwidth(0) / 2 + if squeeze_width > 40 then + return true + end + return false +end + +-- gls.left[7] = { +-- DiffAdd = { +-- provider = 'DiffAdd', +-- condition = checkwidth, +-- icon = ' ', +-- highlight = {colors.green,colors.purple}, +-- } +-- } +-- gls.left[8] = { +-- DiffModified = { +-- provider = 'DiffModified', +-- condition = checkwidth, +-- icon = ' ', +-- highlight = {colors.orange,colors.purple}, +-- } +-- } +-- gls.left[9] = { +-- DiffRemove = { +-- provider = 'DiffRemove', +-- condition = checkwidth, +-- icon = ' ', +-- highlight = {colors.red,colors.purple}, +-- } +-- } +gls.left[10] = { + LeftEnd = { + provider = function() return ' ' end, + separator = ' ', + separator_highlight = {colors.purple,colors.bg}, + highlight = {colors.purple,colors.bg} + } +} +gls.left[11] = { + DiagnosticError = { + provider = 'DiagnosticError', + icon = ' ', + highlight = {colors.red,colors.bg} + } +} +gls.left[12] = { + Space = { + provider = function () return '' end + } +} +gls.left[13] = { + DiagnosticWarn = { + provider = 'DiagnosticWarn', + icon = ' ', + highlight = {colors.blue,colors.bg}, + } +} +gls.right[1]= { + FileFormat = { + provider = 'FileFormat', + separator = ' ', + separator_highlight = {colors.bg,colors.purple}, + highlight = {colors.grey,colors.purple}, + } +} +gls.right[2] = { + LineInfo = { + provider = 'LineColumn', + separator = ' | ', + separator_highlight = {colors.darkblue,colors.purple}, + highlight = {colors.grey,colors.purple}, + }, +} +gls.right[3] = { + PerCent = { + provider = 'LinePercent', + separator = ' ', + separator_highlight = {colors.darkblue,colors.purple}, + highlight = {colors.grey,colors.darkblue}, + } +} +gls.right[4] = { + ScrollBar = { + provider = 'ScrollBar', + highlight = {colors.yellow,colors.purple}, + } +} + +-- gls.short_line_left[1] = { +-- BufferType = { +-- provider = 'FileTypeName', +-- separator = ' ', +-- separator_highlight = {colors.purple,colors.bg}, +-- highlight = {colors.grey,colors.purple} +-- } +-- } + + +-- gls.short_line_right[1] = { +-- BufferIcon = { +-- provider= 'BufferIcon', +-- separator = ' ', +-- separator_highlight = {colors.purple,colors.bg}, +-- highlight = {colors.grey,colors.purple} +-- } +-- } diff --git a/lua/web-devicons-config.lua b/lua/web-devicons-config.lua deleted file mode 100644 index 3960f0f9..00000000 --- a/lua/web-devicons-config.lua +++ /dev/null @@ -1 +0,0 @@ -require'nvim-web-devicons'.setup() diff --git a/themes/airline.vim b/themes/airline.vim index 127a58ee..07848515 100644 --- a/themes/airline.vim +++ b/themes/airline.vim @@ -37,7 +37,7 @@ let g:airline_section_c = airline#section#create(['']) " let g:airline_section_z = airline#section#create(['linenr']) " Switch to your current theme -" let g:airline_theme = 'onedark' +let g:airline_theme = 'one' " Always show tabs set showtabline=2 diff --git a/themes/nvcode.vim b/themes/nvcode.vim index 7a497c33..9f010681 100644 --- a/themes/nvcode.vim +++ b/themes/nvcode.vim @@ -1,10 +1,9 @@ hi Comment cterm=italic -let g:nvcode_hide_endofbuffer=1 -let g:nvcode_terminal_italics=1 let g:nvcode_termcolors=256 syntax on colorscheme nvcode +" colorscheme onedark " checks if your terminal has 24-bit color support diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index fcf3c7ad..1f1f1269 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -68,7 +68,8 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Intellisense Plug 'neoclide/coc.nvim', {'branch': 'release'} " Status Line - Plug 'vim-airline/vim-airline' + Plug 'glepnir/galaxyline.nvim' + " Plug 'vim-airline/vim-airline' Plug 'kevinhwang91/rnvimr' " FZF Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } |