From 3de4631607351a7edbbf560ba3291ca29d37e200 Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Fri, 25 Aug 2023 18:15:26 +0300
Subject: [PATCH] nvim, vim, wezterm: back to solarized8

---
 cli/.bashrc                      |  4 ++--
 cli/.config/nvim/lua/plugins.lua | 10 ++++------
 cli/.vimplugrc                   | 11 +++++------
 gui/.wezterm.lua                 | 12 ++++++------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/cli/.bashrc b/cli/.bashrc
index 910ffdc..c4bb750 100644
--- a/cli/.bashrc
+++ b/cli/.bashrc
@@ -29,9 +29,9 @@ rgrep()  { command grep --exclude-dir=\.git -R "$@"; }
 whence() { command -v "$@"; }
 
 # ls
-ls() { command ls --color=auto --group-directories-first "$@"; }
+ls() { command ls --color=auto "$@"; }
 ll() { ls -alh "$@"; }
-ll() { ls -dlh "$@"; }
+ld() { ls -dlh "$@"; }
 
 # git
 gci()   { command git commit "$@"; }
diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua
index e831eba..8ea31f1 100644
--- a/cli/.config/nvim/lua/plugins.lua
+++ b/cli/.config/nvim/lua/plugins.lua
@@ -3,7 +3,7 @@ local function plugins(use)
     use 'wbthomason/packer.nvim'
 
     use {
-        'lifepillar/vim-gruvbox8',
+        'lifepillar/vim-solarized8',
         branch = 'neovim'
     }
     use 'lifepillar/vim-cheat40'
@@ -43,10 +43,8 @@ map('n', '<Leader>.', '<cmd>Telescope git_files<CR>')
 map('n', '<Leader>,', '<cmd>Telescope buffers<CR>')
 
 --[[ theme ]]
-vim.o.bg = 'dark'
+vim.g.solarized_extra_hi_groups = 1
 vim.o.termguicolors = true
+vim.o.bg = 'light'
 
-vim.g.gruvbox_plugin_hi_groups   = 1
-vim.g.gruvbox_filetype_hi_groups = 1
-
-vim.cmd [[colorscheme gruvbox8]]
+vim.cmd [[colorscheme solarized8]]
diff --git a/cli/.vimplugrc b/cli/.vimplugrc
index b494b95..1aa1f5d 100644
--- a/cli/.vimplugrc
+++ b/cli/.vimplugrc
@@ -4,7 +4,7 @@ autocmd BufRead *vimplugrc set ft=vim
 execute 'source' fnameescape(g:plug)
 plug#begin(g:plugdir)
 Plug 'junegunn/vim-plug'
-Plug 'lifepillar/vim-gruvbox8'
+Plug 'lifepillar/vim-solarized8'
 
 Plug 'hashivim/vim-terraform'
 Plug 'itchyny/lightline.vim'
@@ -32,7 +32,7 @@ nmap <Leader>ft :Filetypes<CR>
 
 # lightline
 g:lightline = {
-    colorscheme:  'gruvbox8',
+    colorscheme:  'solarized',
     separator:    { left: '', right: ''},
     subseparator: { left: '\u2022', right: '\u2022'}
 }
@@ -45,10 +45,9 @@ if has('gui_running')
     map! <S-Insert> <MiddleMouse>
 endif
 
-g:gruvbox_plugin_hi_groups   = 1
-g:gruvbox_filetype_hi_groups = 1
+g:solarized_extra_hi_groups = 1
 &t_8f = "\u1b[38;2;%lu;%lu;%lum"
 &t_8b = "\u1b[48;2;%lu;%lu;%lum"
 &tgc  = 1
-&bg   = 'dark'
-colorscheme gruvbox8
+&bg   = 'light'
+colorscheme solarized8
diff --git a/gui/.wezterm.lua b/gui/.wezterm.lua
index c43b204..93cb247 100644
--- a/gui/.wezterm.lua
+++ b/gui/.wezterm.lua
@@ -3,16 +3,16 @@ local act = wt.action
 local font = 'VascadiaMod'
 local harfbuzz_features = nil
 local fontsizes = { Darwin = 14, others = 11 }
-local theme = 'GruvboxDark'
+local theme = 'Solarized Light (Gogh)'
 local overrides = {
     fonts = {
         font = wt.font('JetBrains Mono'),
         harfbuzz_features = { 'calt=0', 'clig=0', 'liga=0' }
     },
-    theme = { color_scheme = 'PencilLight' }
+    theme = { color_scheme = 'GruvboxDark' }
 }
-local tab_bar_bg = '#ebdbae'
-local tab_bar_fg = '#282828'
+local tab_bar_bg = '#eee8d5'
+local tab_bar_fg = '#657b83'
 local tab_bar_defaults = {
     bg_color = tab_bar_bg,
     fg_color = tab_bar_fg,
@@ -24,8 +24,8 @@ local tab_bar_active = {
     italic = true
 }
 local custom_colors = {
-    cursor_bg = '#d65d0e',
-    cursor_fg = '#ebdbb2',
+    cursor_bg = '#cb4b16',
+    cursor_fg = '#fdf6e3',
     tab_bar = {
         background = tab_bar_bg,
         active_tab = tab_bar_active,