From e9903ab20e73c55e22aaabea2b38766aec80a4b7 Mon Sep 17 00:00:00 2001 From: "Juan J. Martinez" Date: Tue, 9 Aug 2022 23:19:35 +0100 Subject: Back to gruvbox :( --- init.vim | 12 ++++------- lualine.lua | 2 +- plugins.vim | 2 +- setup | 4 +--- tmux-gruvbox-dark.conf | 50 +++++++++++++++++++++++++++++++++++++++++++ tmux.conf | 3 +-- tmux_tokyonight_storm.tmux | 30 -------------------------- wezterm.lua | 16 +++++++++++++- wezterm_tokyonight_storm.toml | 14 ------------ 9 files changed, 73 insertions(+), 60 deletions(-) create mode 100644 tmux-gruvbox-dark.conf delete mode 100644 tmux_tokyonight_storm.tmux delete mode 100644 wezterm_tokyonight_storm.toml diff --git a/init.vim b/init.vim index 674b64e..8156d42 100644 --- a/init.vim +++ b/init.vim @@ -49,14 +49,10 @@ set omnifunc=syntaxcomplete#Complete set termguicolors set background=dark -let g:tokyonight_italic_keywords = 0 -let g:tokyonight_colors = { - \ 'comment': '#5e6691', - \ 'fg_gutter': '#505777', -\ } -let g:tokyonight_day_brightness = 0.2 - -colorscheme tokyonight +let g:gruvbox_material_background = 'soft' +let g:gruvbox_material_better_performance = 1 +let g:gruvbox_material_enable_bold = 1 +colorscheme gruvbox-material " toggle spell check map s :set spell! spelllang=en_gb diff --git a/lualine.lua b/lualine.lua index 50c97c7..42e551f 100644 --- a/lualine.lua +++ b/lualine.lua @@ -1,6 +1,6 @@ require('lualine').setup { options = { - theme = 'tokyonight', + theme = 'gruvbox-material', }, sections = { lualine_a = {'mode'}, diff --git a/plugins.vim b/plugins.vim index 0cae193..031e0c1 100644 --- a/plugins.vim +++ b/plugins.vim @@ -12,7 +12,7 @@ Plug 'roxma/vim-tmux-clipboard' Plug 'wincent/terminus' " life improvements -Plug 'reidrac/tokyonight.nvim', { 'branch': 'main' } +Plug 'sainnhe/gruvbox-material' Plug 'preservim/nerdtree' Plug 'Chiel92/vim-autoformat' Plug 'godlygeek/tabular' diff --git a/setup b/setup index d381799..7259d31 100755 --- a/setup +++ b/setup @@ -7,9 +7,7 @@ rm -f ~/.tmux.conf ln -s ~/.config/nvim/tmux.conf ~/.tmux.conf echo "Setting symlinks for wezterm..." -mkdir -p ~/.config/wezterm/colors/ -rm -f ~/.config/wezterm/colors/wezterm_tokyonight_storm.toml -ln -s ~/.config/nvim/wezterm_tokyonight_storm.toml ~/.config/wezterm/colors/wezterm_tokyonight_storm.toml +mkdir -p ~/.config/wezterm/ rm -f ~/.config/wezterm/wezterm.lua ln -s ~/.config/nvim/wezterm.lua ~/.config/wezterm/wezterm.lua diff --git a/tmux-gruvbox-dark.conf b/tmux-gruvbox-dark.conf new file mode 100644 index 0000000..8d86699 --- /dev/null +++ b/tmux-gruvbox-dark.conf @@ -0,0 +1,50 @@ +## COLORSCHEME: gruvbox dark (medium) +set-option -g status "on" + +# default statusbar color +set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1 + +# default window title colors +set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1 + +# default window with an activity alert +set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3 + +# active window title colors +set-window-option -g window-status-current-style bg=red,fg=colour237 # fg=bg1 + +# pane border +set-option -g pane-active-border-style fg=colour250 #fg2 +set-option -g pane-border-style fg=colour237 #bg1 + +# message infos +set-option -g message-style bg=colour239,fg=colour223 # bg=bg2, fg=fg1 + +# writing commands inactive +set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1 + +# pane number display +set-option -g display-panes-active-colour colour250 #fg2 +set-option -g display-panes-colour colour237 #bg1 + +# clock +set-window-option -g clock-mode-colour colour109 #blue + +# bell +set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg + +## Theme settings mixed with colors (unfortunately, but there is no cleaner way) +set-option -g status-justify "left" +set-option -g status-left-style none +set-option -g status-left-length "80" +set-option -g status-right-style none +set-option -g status-right-length "80" +set-window-option -g window-status-separator "" + +set-option -g status-left "#[bg=colour241,fg=colour248] #S #[bg=colour237,fg=colour241,nobold,noitalics,nounderscore]" +set-option -g status-right "#[bg=colour237,fg=colour239 nobold, nounderscore, noitalics]#[bg=colour239,fg=colour246] %Y-%m-%d  %H:%M #[bg=colour239,fg=colour248,nobold,noitalics,nounderscore]#[bg=colour248,fg=colour237] #h " + +set-window-option -g window-status-current-format "#[bg=colour214,fg=colour237,nobold,noitalics,nounderscore]#[bg=colour214,fg=colour239] #I #[bg=colour214,fg=colour239,bold] #W#{?window_zoomed_flag,*Z,} #[bg=colour237,fg=colour214,nobold,noitalics,nounderscore]" +set-window-option -g window-status-format "#[bg=colour239,fg=colour237,noitalics]#[bg=colour239,fg=colour223] #I #[bg=colour239,fg=colour223] #W #[bg=colour237,fg=colour239,noitalics]" + +# vim: set ft=tmux tw=0 nowrap: diff --git a/tmux.conf b/tmux.conf index 7e492e5..d0a314d 100644 --- a/tmux.conf +++ b/tmux.conf @@ -50,5 +50,4 @@ bind h split-window -v -c "#{pane_current_path}" set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux-3.0 -source-file ~/.config/nvim/tmux_tokyonight_storm.tmux - +source-file ~/.config/nvim/tmux-gruvbox-dark.conf diff --git a/tmux_tokyonight_storm.tmux b/tmux_tokyonight_storm.tmux deleted file mode 100644 index 0ea81ae..0000000 --- a/tmux_tokyonight_storm.tmux +++ /dev/null @@ -1,30 +0,0 @@ -# TokyoNight colors for Tmux - -set -g mode-style "fg=#7aa2f7,bg=#3b4261" - -set -g message-style "fg=#7aa2f7,bg=#3b4261" -set -g message-command-style "fg=#7aa2f7,bg=#3b4261" - -set -g pane-border-style "fg=#3b4261" -set -g pane-active-border-style "fg=#7aa2f7" - -set -g status "on" -set -g status-justify "left" - -set -g status-style "fg=#7aa2f7,bg=#1f2335" - -set -g status-left-length "100" -set -g status-right-length "100" - -set -g status-left-style NONE -set -g status-right-style NONE - -set -g status-left "#[fg=#1D202F,bg=#7aa2f7,bold] #S #[fg=#7aa2f7,bg=#1f2335,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#1f2335] #{prefix_highlight} #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %Y-%m-%d  %I:%M %p #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#1D202F,bg=#7aa2f7,bold] #h " - -setw -g window-status-activity-style "underscore,fg=#a9b1d6,bg=#1f2335" -setw -g window-status-separator "" -setw -g window-status-style "NONE,fg=#a9b1d6,bg=#1f2335" -setw -g window-status-format "#[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#1f2335,bg=#1f2335,nobold,nounderscore,noitalics]" -setw -g window-status-current-format "#[fg=#1f2335,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261,bold] #I  #W #F #[fg=#3b4261,bg=#1f2335,nobold,nounderscore,noitalics]" - diff --git a/wezterm.lua b/wezterm.lua index c4ad9ac..a6200fd 100644 --- a/wezterm.lua +++ b/wezterm.lua @@ -18,7 +18,21 @@ return { font_size = 10.0, custom_block_glyphs = false, warn_about_missing_glyphs = false, - color_scheme = "wezterm_tokyonight_storm", + color_scheme = "gruvbox_material_dark_hard", + color_schemes = { + ["gruvbox_material_dark_hard"] = { + foreground = "#D4BE98", + background = "#1D2021", + cursor_bg = "#D4BE98", + cursor_border = "#D4BE98", + cursor_fg = "#1D2021", + selection_bg = "#D4BE98" , + selection_fg = "#3C3836", + + ansi = {"#1d2021","#ea6962","#a9b665","#d8a657", "#7daea3","#d3869b", "#89b482","#d4be98"}, + brights = {"#eddeb5","#ea6962","#a9b665","#d8a657", "#7daea3","#d3869b", "#89b482","#d4be98"}, + }, + }, hide_tab_bar_if_only_one_tab = true, window_padding = { left = "1cell", diff --git a/wezterm_tokyonight_storm.toml b/wezterm_tokyonight_storm.toml deleted file mode 100644 index 6154319..0000000 --- a/wezterm_tokyonight_storm.toml +++ /dev/null @@ -1,14 +0,0 @@ -# mkdir -p $HOME/.config/wezterm/colors -# ln -s $HOME/.config/nvim/wezterm_tokyonight_storm.toml $HOME/.config/wezterm/colors -[colors] -foreground = "#c0caf5" -background = "#24283b" -cursor_bg = "#c0caf5" -cursor_border = "#c0caf5" -cursor_fg = "#24283b" -selection_bg = "#364A82" -selection_fg = "#c0caf5" - -ansi = ["#1D202F", "#f7768e", "#9ece6a", "#e0af68", "#7aa2f7", "#bb9af7", "#7dcfff", "#a9b1d6"] -brights = ["#414868", "#f7768e", "#9ece6a", "#e0af68", "#7aa2f7", "#bb9af7", "#7dcfff", "#c0caf5"] - -- cgit v1.2.3