von/vdotfiles
1
0
Fork 0
Code Activity

nvim, vim, wezterm: back to solarized8

Browse source
This commit is contained in:
Von Random 2023-08-25 18:15:26 +03:00
parent 466d355a9c
commit 3de4631607
4 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/.bashrc
View file

@ -29,9 +29,9 @@ rgrep() { command grep --exclude-dir=\.git -R "$@"; }
whence() { command -v "$@"; } whence() { command -v "$@"; }
# ls # ls
ls() { command ls --color=auto --group-directories-first "$@"; } ls() { command ls --color=auto "$@"; }
ll() { ls -alh "$@"; } ll() { ls -alh "$@"; }
ll() { ls -dlh "$@"; } ld() { ls -dlh "$@"; }
# git # git
gci() { command git commit "$@"; } gci() { command git commit "$@"; }

10
cli/.config/nvim/lua/plugins.lua
View file

@ -3,7 +3,7 @@ local function plugins(use)
use 'wbthomason/packer.nvim' use 'wbthomason/packer.nvim'
use { use {
'lifepillar/vim-gruvbox8', 'lifepillar/vim-solarized8',
branch = 'neovim' branch = 'neovim'
} }
use 'lifepillar/vim-cheat40' use 'lifepillar/vim-cheat40'
@ -43,10 +43,8 @@ map('n', '<Leader>.', '<cmd>Telescope git_files<CR>')
map('n', '<Leader>,', '<cmd>Telescope buffers<CR>') map('n', '<Leader>,', '<cmd>Telescope buffers<CR>')
--[[ theme ]] --[[ theme ]]
vim.o.bg = 'dark' vim.g.solarized_extra_hi_groups = 1
vim.o.termguicolors = true vim.o.termguicolors = true
vim.o.bg = 'light'
vim.g.gruvbox_plugin_hi_groups = 1 vim.cmd [[colorscheme solarized8]]
vim.g.gruvbox_filetype_hi_groups = 1
vim.cmd [[colorscheme gruvbox8]]

11
cli/.vimplugrc
View file

@ -4,7 +4,7 @@ autocmd BufRead *vimplugrc set ft=vim
execute 'source' fnameescape(g:plug) execute 'source' fnameescape(g:plug)
plug#begin(g:plugdir) plug#begin(g:plugdir)
Plug 'junegunn/vim-plug' Plug 'junegunn/vim-plug'
Plug 'lifepillar/vim-gruvbox8' Plug 'lifepillar/vim-solarized8'
Plug 'hashivim/vim-terraform' Plug 'hashivim/vim-terraform'
Plug 'itchyny/lightline.vim' Plug 'itchyny/lightline.vim'
@ -32,7 +32,7 @@ nmap <Leader>ft :Filetypes<CR>
# lightline # lightline
g:lightline = { g:lightline = {
colorscheme: 'gruvbox8', colorscheme: 'solarized',
separator: { left: '', right: ''}, separator: { left: '', right: ''},
subseparator: { left: '\u2022', right: '\u2022'} subseparator: { left: '\u2022', right: '\u2022'}
} }
@ -45,10 +45,9 @@ if has('gui_running')
map! <S-Insert> <MiddleMouse> map! <S-Insert> <MiddleMouse>
endif endif
g:gruvbox_plugin_hi_groups = 1 g:solarized_extra_hi_groups = 1
g:gruvbox_filetype_hi_groups = 1
&t_8f = "\u1b[38;2;%lu;%lu;%lum" &t_8f = "\u1b[38;2;%lu;%lu;%lum"
&t_8b = "\u1b[48;2;%lu;%lu;%lum" &t_8b = "\u1b[48;2;%lu;%lu;%lum"
&tgc = 1 &tgc = 1
&bg = 'dark' &bg = 'light'
colorscheme gruvbox8 colorscheme solarized8

12
gui/.wezterm.lua
View file

@ -3,16 +3,16 @@ local act = wt.action
local font = 'VascadiaMod' local font = 'VascadiaMod'
local harfbuzz_features = nil local harfbuzz_features = nil
local fontsizes = { Darwin = 14, others = 11 } local fontsizes = { Darwin = 14, others = 11 }
local theme = 'GruvboxDark' local theme = 'Solarized Light (Gogh)'
local overrides = { local overrides = {
fonts = { fonts = {
font = wt.font('JetBrains Mono'), font = wt.font('JetBrains Mono'),
harfbuzz_features = { 'calt=0', 'clig=0', 'liga=0' } harfbuzz_features = { 'calt=0', 'clig=0', 'liga=0' }
}, },
theme = { color_scheme = 'PencilLight' } theme = { color_scheme = 'GruvboxDark' }
} }
local tab_bar_bg = '#ebdbae' local tab_bar_bg = '#eee8d5'
local tab_bar_fg = '#282828' local tab_bar_fg = '#657b83'
local tab_bar_defaults = { local tab_bar_defaults = {
bg_color = tab_bar_bg, bg_color = tab_bar_bg,
fg_color = tab_bar_fg, fg_color = tab_bar_fg,
@ -24,8 +24,8 @@ local tab_bar_active = {
italic = true italic = true
} }
local custom_colors = { local custom_colors = {
cursor_bg = '#d65d0e', cursor_bg = '#cb4b16',
cursor_fg = '#ebdbb2', cursor_fg = '#fdf6e3',
tab_bar = { tab_bar = {
background = tab_bar_bg, background = tab_bar_bg,
active_tab = tab_bar_active, active_tab = tab_bar_active,