wezterm, nvim: gruvbox

3 files changed, 32 insertions, 18 deletions

diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua
index 8e159dd..af96976 100644
--- a/cli/.config/nvim/lua/plugins.lua
+++ b/cli/.config/nvim/lua/plugins.lua
@@ -1,23 +1,34 @@
 -- [[ plugins bootstrap ]]
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 local lazyurl = "https://github.com/folke/lazy.nvim.git"
-local lazycmd = { "git", "clone", "--filter=blob:none", "--branch=stable", lazyurl, lazypath }
+local lazycmd = {"git", "clone", "--filter=blob:none", "--branch=stable",
+                 lazyurl, lazypath}
 if not vim.loop.fs_stat(lazypath) then vim.fn.system(lazycmd) end
 vim.opt.rtp:prepend(lazypath)
 
 --[[ plugins list ]]
 require('lazy').setup {
+    {'lifepillar/vim-gruvbox8', branch = 'neovim'},
     {'lifepillar/vim-solarized8', branch = 'neovim'},
     {'nvim-telescope/telescope.nvim', dependencies = {'nvim-lua/plenary.nvim'}},
     {'nvim-treesitter/nvim-treesitter', cmd = 'TSUpdate'},
     {'w0rp/ale', cmd = 'ALEEnable', ft = {'bash', 'go', 'lua', 'python', 'sh', 'zsh'}},
     'lewis6991/gitsigns.nvim',
     'lifepillar/vim-cheat40',
+    'nvim-lualine/lualine.nvim',
     'tpope/vim-rsi',
     'tpope/vim-vinegar',
 }
 
 --[[ plugin configs and maps ]]
+local ll_sep = "\u{2022}"
+require('lualine').setup {
+    options = {
+        icons_enabled = false,
+        component_separators = { left = ll_sep, right = ll_sep},
+        section_separators = { left = null, right = null}
+    }
+}
 require('gitsigns').setup()
 require('nvim-treesitter.configs').setup {
     highlight = {
@@ -29,11 +40,14 @@ map('n', '<Leader>L', '<cmd>Lazy<CR>')
 map('n', '<Leader>?', '<cmd>Cheat40<CR>')
 map('n', '<Leader>.', '<cmd>Telescope git_files<CR>')
 map('n', '<Leader>,', '<cmd>Telescope buffers<CR>')
+map('n', '<Leader>T', '<cmd>colorscheme solarized8|set bg=light<CR>')
+map('n', '<Leader>t', '<cmd>colorscheme gruvbox8|set bg=dark<CR>')
 
 --[[ theme ]]
-vim.g.solarized_extra_hi_groups = 1
-vim.g.solarized_t_Co = 16
-vim.o.termguicolors = false
-vim.o.bg = 'light'
+vim.g.solarized_extra_hi_groups  = 1
+vim.g.gruvbox_plugin_hi_groups   = 1
+vim.g.gruvbox_filetype_hi_groups = 1
+vim.o.termguicolors = true
+vim.o.bg = 'dark'
 
-vim.cmd [[colorscheme solarized8]]
+vim.cmd [[colorscheme gruvbox8]]
diff --git a/gui/.config/wezterm/overrides.lua b/gui/.config/wezterm/overrides.lua
index 3f553fe..3aff90e 100644
--- a/gui/.config/wezterm/overrides.lua
+++ b/gui/.config/wezterm/overrides.lua
@@ -4,12 +4,12 @@ local fn = require('functions')
 local current = {}
 
 -- colors
-local color_scheme = 'GruvboxDark'
-local tab_fg = '#ebdbb2'
-local tab_bg = '#504945'
-local tab_bg_active = '#282828'
-local cursor_fg = '#ebdbb2'
-local cursor_bg = '#d65d0e'
+local color_scheme = 'Solarized Light (Gogh)'
+local tab_fg = '#657b83'
+local tab_bg = '#eee8d5'
+local tab_bg_active = '#fdf6e3'
+local cursor_fg = '#fdf6e3'
+local cursor_bg = '#cb4b16'
 
 -- fonts
 local fonts = wt.config_builder()
diff --git a/gui/.config/wezterm/wezterm.lua b/gui/.config/wezterm/wezterm.lua
index 88840f7..47bc512 100644
--- a/gui/.config/wezterm/wezterm.lua
+++ b/gui/.config/wezterm/wezterm.lua
@@ -3,12 +3,12 @@ local kb = require('keybinds')
 local fn = require('functions')
 
 -- colors
-local color_scheme = 'Solarized Light (Gogh)'
-local tab_fg = '#657b83'
-local tab_bg = '#eee8d5'
-local tab_bg_active = '#fdf6e3'
-local cursor_fg = '#fdf6e3'
-local cursor_bg = '#cb4b16'
+local color_scheme = 'GruvboxDark'
+local tab_fg = '#ebdbb2'
+local tab_bg = '#504945'
+local tab_bg_active = '#282828'
+local cursor_fg = '#ebdbb2'
+local cursor_bg = '#d65d0e'
 
 -- misc
 local cfg = wt.config_builder()