diff --git a/alacritty/.config/alacritty/themes/dark.yml b/alacritty/.config/alacritty/themes/dark.yml index 7c59efb..d2f4158 100644 --- a/alacritty/.config/alacritty/themes/dark.yml +++ b/alacritty/.config/alacritty/themes/dark.yml @@ -1,28 +1,30 @@ -# Colors (Ayu Mirage) +# Colors (Gruvbox dark) colors: # Default colors primary: - background: '#202734' - foreground: '#CBCCC6' + # hard contrast: background = '0x1d2021' + background: '0x282828' + # soft contrast: background = '0x32302f' + foreground: '0xebdbb2' # Normal colors normal: - black: '#191E2A' - red: '#FF3333' - green: '#BAE67E' - yellow: '#FFA759' - blue: '#73D0FF' - magenta: '#FFD580' - cyan: '#95E6CB' - white: '#C7C7C7' + black: '0x282828' + red: '0xcc241d' + green: '0x98971a' + yellow: '0xd79921' + blue: '0x458588' + magenta: '0xb16286' + cyan: '0x689d6a' + white: '0xa89984' # Bright colors bright: - black: '#686868' - red: '#F27983' - green: '#A6CC70' - yellow: '#FFCC66' - blue: '#5CCFE6' - magenta: '#FFEE99' - cyan: '#95E6CB' - white: '#FFFFFF' + black: '0x928374' + red: '0xfb4934' + green: '0xb8bb26' + yellow: '0xfabd2f' + blue: '0x83a598' + magenta: '0xd3869b' + cyan: '0x8ec07c' + white: '0xebdbb2' diff --git a/alacritty/.config/alacritty/themes/light.yml b/alacritty/.config/alacritty/themes/light.yml index f0ecac8..3a10d3b 100644 --- a/alacritty/.config/alacritty/themes/light.yml +++ b/alacritty/.config/alacritty/themes/light.yml @@ -1,27 +1,30 @@ -# ayu-light +# Colors (Gruvbox light) colors: + # Default colors primary: - background: '0xfafafa' - foreground: '0x5b6672' + # hard contrast: background = '0xf9f5d7' + background: '0xfbf1c7' + # soft contrast: background = '0xf2e5bc' + foreground: '0x3c3836' # Normal colors normal: - black: '0x000000' #0 - red: '0xf2590b' #1 - green: '0x76cc00' #2 - yellow: '0xf29717' #3 - blue: '0x41a5d9' #4 - magenta: '0x9965cc' #5 - cyan: '0x4dbf98' #6 - white: '0xc7c7c7' #7 + black: '0xfbf1c7' + red: '0xcc241d' + green: '0x98971a' + yellow: '0xd79921' + blue: '0x458588' + magenta: '0xb16286' + cyan: '0x689d6a' + white: '0x7c6f64' # Bright colors bright: - black: '0x676767' - red: '0xd6646a' #9 - green: '0xa3d900' #10 - yellow: '0xe7c446' #11 - blue: '0x6871ff' #12 - magenta: '0xa37acc' #13 - cyan: '0x56d9ad' #14 - white: '0xfeffff' #15 + black: '0x928374' + red: '0x9d0006' + green: '0x79740e' + yellow: '0xb57614' + blue: '0x076678' + magenta: '0x8f3f71' + cyan: '0x427b58' + white: '0x3c3836' diff --git a/bin/bin/toggle-color-mode b/bin/bin/toggle-color-mode index c3ed4c5..45d2ce2 100755 --- a/bin/bin/toggle-color-mode +++ b/bin/bin/toggle-color-mode @@ -20,3 +20,11 @@ echo $alacritty_header > $alacritty/alacritty.yml cat $alacritty/alacritty-base.yml $alacritty/themes/$new_color.yml >> $alacritty/alacritty.yml echo $new_color > $color_file + +for pane_info in $(tmux list-panes -a -F '#{pane_id}-#{pane_current_command}'); do + IFS=- read pane cmd <<< "$pane_info" + + if [[ $cmd == "vim" || $cmd == "nvim" ]]; then + tmux send-keys -t $pane ":call ChangeBackground()" ENTER + fi +done diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index 39826a8..0762e1f 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -1,5 +1,8 @@ bind-key r source-file ~/.config/tmux/tmux.conf \; display-message " ✱ tmux.conf is reloaded" +set -g default-terminal "alacritty" +set -ag terminal-overrides ",alacritty:RGB" + # for muxception bind-key b send-prefix diff --git a/vim/.vimrc b/vim/.vimrc index 31c15ca..93e4423 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -18,6 +18,9 @@ Plug 'rust-lang/rust.vim' Plug 'tpope/vim-rails' Plug 'vim-ruby/vim-ruby' +" colors +Plug 'morhetz/gruvbox' + call plug#end() " STATUS LINE @@ -124,6 +127,17 @@ autocmd BufNewFile,BufRead *.tftpl :set filetype=terraform " other map fj :%!jq . +" COLOR CONFIGURATION +colorscheme gruvbox + +" NONE is case sensitive in vim here (but not nvim) +autocmd ColorScheme * hi Normal ctermbg=NONE guibg=NONE + +function! ChangeBackground() + let &background=readfile(glob("~/.config/atomaka/color.yml"))[0] +endfunction +call ChangeBackground() + " PLUGIN CONFIGURATION " editorconfig-vim let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*']