diff --git a/home/.config/alacritty/alacritty.yml b/home/.config/alacritty/alacritty.yml index dd1e895..1bf270b 100644 --- a/home/.config/alacritty/alacritty.yml +++ b/home/.config/alacritty/alacritty.yml @@ -9,7 +9,7 @@ # All imports must either be absolute paths starting with `/`, or paths relative # to the user's home directory starting with `~/`. import: - - ./dracula.yml + - ./gruvbox.yml # Any items in the `env` entry below will be added as # environment variables. Some entries may override variables diff --git a/home/.config/alacritty/gruvbox.yml b/home/.config/alacritty/gruvbox.yml new file mode 100644 index 0000000..3ead060 --- /dev/null +++ b/home/.config/alacritty/gruvbox.yml @@ -0,0 +1,59 @@ +# Colors (Gruvbox dark) +colors: + primary: + # hard contrast background - '#1d2021' + background: &gruvbox_dark_bg '#282828' + # soft contrast background - '#32302f' + foreground: '#fbf1c7' + bright_foreground: '#f9f5d7' + dim_foreground: '#f2e5bc' + cursor: + text: CellBackground + cursor: CellForeground + vi_mode_cursor: + text: CellBackground + cursor: CellForeground + # search: + # matches: + # foreground: '#000000' + # background: '#ffffff' + # focused_match: + # foreground: CellBackground + # background: CellForeground + # bar: + # background: '' + # foreground: '' + # line_indicator: + # foreground: None + # background: None + selection: + text: CellBackground + background: CellForeground + bright: + black: '#928374' + red: '#fb4934' + green: '#b8bb26' + yellow: '#fabd2f' + blue: '#83a598' + magenta: '#d3869b' + cyan: '#8ec07c' + white: '#ebdbb2' + normal: + black: *gruvbox_dark_bg + red: '#cc241d' + green: '#98971a' + yellow: '#d79921' + blue: '#458588' + magenta: '#b16286' + cyan: '#689d6a' + white: '#a89984' + dim: + black: '#32302f' + red: '#9d0006' + green: '#79740e' + yellow: '#b57614' + blue: '#076678' + magenta: '#8f3f71' + cyan: '#427b58' + white: '#928374' + # indexed_colors: [] diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim index bbee1a4..b5a2333 100644 --- a/home/.config/nvim/init.vim +++ b/home/.config/nvim/init.vim @@ -28,7 +28,7 @@ else endif let g:deoplete#enable_at_startup = 1 -Plug 'dracula/vim', { 'as': 'dracula' } +Plug 'morhetz/gruvbox' Plug 'Chiel92/vim-autoformat' Plug 'Lokaltog/vim-easymotion' Plug 'airblade/vim-gitgutter' @@ -59,26 +59,26 @@ if executable('ag') let $FZF_DEFAULT_COMMAND = 'ag --skip-vcs-ignores --nocolor -g "" -l' endif -colorscheme dracula " Color scheme -set laststatus=2 " Enable airline -let g:airline_theme = 'jellybeans' " Airline color scheme -let g:airline#extensions#tabline#enabled = 1 " Enable tab list in airline +autocmd vimenter * ++nested colorscheme gruvbox " Color scheme +set laststatus=2 " Enable airline +let g:airline_theme = 'gruvbox' " Airline color scheme +let g:airline#extensions#tabline#enabled = 1 " Enable tab list in airline let g:airline#extensions#tabline#left_sep = ' ' let g:airline#extensions#tabline#left_alt_sep = '|' let g:airline#extensions#whitespace#mixed_indent_algo = 1 let g:airline_powerline_fonts = 1 -set list " Show tabs -set listchars=tab:\|\ ,trail:· " Show whitestape by using the pipe symbol and dots -set tabstop=4 " Tabs look like 4 spaces -set softtabstop=0 noexpandtab " Tabs look like 4 spaces -set shiftwidth=4 " Tabs look like 4 spaces -set number " Show line numbers -set cursorline " Highlight entire line that cursor is on -let g:tagbar_left = 1 " Make tagbar appear on the left -autocmd CompleteDone * pclose " Remove scratchpad after selection -set mouse= " Disable mouse -set lazyredraw " Make large files bearable -set regexpengine=1 " Make searching large files bearable +set list " Show tabs +set listchars=tab:\|\ ,trail:· " Show whitestape by using the pipe symbol and dots +set tabstop=4 " Tabs look like 4 spaces +set softtabstop=0 noexpandtab " Tabs look like 4 spaces +set shiftwidth=4 " Tabs look like 4 spaces +set number " Show line numbers +set cursorline " Highlight entire line that cursor is on +let g:tagbar_left = 1 " Make tagbar appear on the left +autocmd CompleteDone * pclose " Remove scratchpad after selection +set mouse= " Disable mouse +set lazyredraw " Make large files bearable +set regexpengine=1 " Make searching large files bearable " make J work with docblocks and such (if possible) if v:version > 703 || v:version == 703 && has('patch541')