From d8acaa4d98300bc239d5895817a9fe84076a49b6 Mon Sep 17 00:00:00 2001 From: Andre Henriques Date: Sat, 8 Jul 2023 23:33:53 +0100 Subject: [PATCH] changed theme --- .gitignore | 2 +- after/plugin/airline.lua | 36 --------------- after/plugin/colors.lua | 3 +- after/plugin/lualine.lua | 94 ++++++++++++++++++++++++++++++++++++++++ lua/andr3/packer.lua | 10 ++++- 5 files changed, 105 insertions(+), 40 deletions(-) delete mode 100644 after/plugin/airline.lua create mode 100644 after/plugin/lualine.lua diff --git a/.gitignore b/.gitignore index d7ad043..d547881 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -plugin/ +packer_compiled.lua diff --git a/after/plugin/airline.lua b/after/plugin/airline.lua deleted file mode 100644 index e45841a..0000000 --- a/after/plugin/airline.lua +++ /dev/null @@ -1,36 +0,0 @@ -vim.g["airline#extensions#tabline#enabled"] = 1 - ---vim.g.airline_left_sep = '»' ---vim.g.airline_left_sep = '▶' ---vim.g.airline_right_sep = '«' ---vim.g.airline_right_sep = '◀' - -vim.g.airline_left_sep = '' -vim.g.airline_left_alt_sep = '' -vim.g.airline_right_sep = '' -vim.g.airline_right_alt_sep = '' -vim.g.airline_symbols.branch = '' -vim.g.airline_symbols.readonly = '' -vim.g.airline_symbols.linenr = '☰' -vim.g.airline_symbols.maxlinenr = '' - - --- vim.g.airline_symbols = {} -vim.g.airline_symbols.crypt = '🔒' -vim.g.airline_symbols.linenr = '☰' -vim.g.airline_symbols.linenr = '␊' -vim.g.airline_symbols.linenr = '␤' -vim.g.airline_symbols.linenr = '¶' -vim.g.airline_symbols.maxlinenr = '' -vim.g.airline_symbols.maxlinenr = '㏑' -vim.g.airline_symbols.branch = '⎇' -vim.g.airline_symbols.paste = 'ρ' -vim.g.airline_symbols.paste = 'Þ' -vim.g.airline_symbols.paste = '∥' -vim.g.airline_symbols.spell = 'Ꞩ' -vim.g.airline_symbols.notexists = 'Ɇ' -vim.g.airline_symbols.whitespace = 'Ξ' - -vim.g.airline_powerline_fonts = 1 - --- vim.g.airline_theme='cyberpunk' diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua index 7a3b977..5a60ceb 100644 --- a/after/plugin/colors.lua +++ b/after/plugin/colors.lua @@ -17,7 +17,8 @@ vim.opt.background = 'light' -- vim.cmd('colorscheme cyberpunk') -- vim.cmd('colorscheme catppuccin-latte') -- vim.cmd('colorscheme oxocarbon') -vim.cmd('colorscheme PaperColor') +-- vim.cmd('colorscheme PaperColor') +vim.cmd('colorscheme bubblegum-256-light') -- examples for your init.lua diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua new file mode 100644 index 0000000..268a8da --- /dev/null +++ b/after/plugin/lualine.lua @@ -0,0 +1,94 @@ +local colors = { + black = '#212121', + white = '#ebdbb2', + red = '#fb4934', + green = '#b8bb26', + blue = '#83a598', + yellow = '#fe8019', + gray = '#a89984', + darkgray = '#3c3836', + lightgray = '#504945', + inactivegray = '#7c6f64', + cute_light_pink='#FCDFE5', + cute_light_blue='#25BFFC', + cute_blue='#55cdfc', + cute_pink='#F48DA2', + green = '#4EC930', + red = '#FC545D', + ocre = '#f7a8b8', + orange = '#FC8553' +} + +local bubblegum_theme = { + normal = { + a = {bg = colors.cute_blue, fg = colors.black, gui = 'bold'}, + b = {bg = colors.cute_pink, fg = colors.cute_light_blue}, + c = {bg = colors.cute_light_pink, fg = colors.cute_light_blue} + }, + insert = { + a = {bg = colors.green, fg = colors.black, gui = 'bold'}, + b = {bg = colors.cute_pink, fg = colors.cute_light_blue}, + c = {bg = colors.cute_light_pink, fg = colors.cute_light_blue} + }, + visual = { + a = {bg = colors.yellow, fg = colors.black, gui = 'bold'}, + b = {bg = colors.cute_pink, fg = colors.cute_light_blue}, + c = {bg = colors.cute_light_pink, fg = colors.cute_light_blue} + }, + replace = { + a = {bg = colors.red, fg = colors.black, gui = 'bold'}, + b = {bg = colors.cute_pink, fg = colors.cute_light_blue}, + c = {bg = colors.cute_light_pink, fg = colors.cute_light_blue} + }, + command = { + a = {bg = colors.ocre, fg = colors.black, gui = 'bold'}, + b = {bg = colors.cute_pink, fg = colors.cute_light_blue}, + c = {bg = colors.cute_light_pink, fg = colors.cute_light_blue} + }, + inactive = { + a = {bg = colors.cute_light_pink, fg = colors.cute_light_blue, gui = 'bold'}, + b = {bg = colors.cute_light_pink, fg = colors.cute_light_blue}, + c = {bg = colors.cute_light_pink, fg = colors.cute_light_blue} + } +} + +require('lualine').setup { + options = { + icons_enabled = true, + theme=bubblegum_theme, + component_separators = { left = '', right = ''}, + section_separators = { left = '', right = ''}, + disabled_filetypes = { + statusline = {}, + winbar = {}, + }, + ignore_focus = {}, + always_divide_middle = true, + globalstatus = false, + refresh = { + statusline = 1000, + tabline = 1000, + winbar = 1000, + } + }, + 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 = {}, + winbar = {}, + inactive_winbar = {}, + extensions = {"nvim-tree"} +} diff --git a/lua/andr3/packer.lua b/lua/andr3/packer.lua index 97c1a37..e6c498a 100644 --- a/lua/andr3/packer.lua +++ b/lua/andr3/packer.lua @@ -13,6 +13,8 @@ return require('packer').startup(function() use { "catppuccin/nvim", as = "catppuccin" } use {'nyoom-engineering/oxocarbon.nvim'} use 'NLKNguyen/papercolor-theme' + -- use 'baskerville/bubblegum' + use 'git@git.andr3h3nriqu3s.com:andr3/bubblegum-theme.git' -- other stuff @@ -49,8 +51,12 @@ return require('packer').startup(function() use 'pangloss/vim-javascript' use 'evanleck/vim-svelte' - use 'vim-airline/vim-airline' - use 'vim-airline/vim-airline-themes' + use 'nvim-lualine/lualine.nvim' + -- If you want to have icons in your statusline choose one of these + use 'nvim-tree/nvim-web-devicons' + + --use 'vim-airline/vim-airline' + --use 'vim-airline/vim-airline-themes' use 'airblade/vim-gitgutter'