From a77ec292e731abe65f24e28300905ea83e913cf8 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Sun, 3 Jan 2021 17:27:45 +0100 Subject: [PATCH] Revert "Back to monokai-ftpd" This reverts commit fdb9b24121b6afbd3cb51e2007056f76e7bc3e73. --- nvim/init.vim | 11 +++++------ zsh/zshrc | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 2e94763..0be84c0 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,5 +1,5 @@ call plug#begin('$XDG_CACHE_HOME/vim-plugins') -Plug 'tomasr/molokai' +Plug 'morhetz/gruvbox' Plug 'junegunn/fzf' Plug 'junegunn/fzf.vim' Plug 'mhinz/vim-signify' @@ -61,9 +61,8 @@ set t_ZR= hi Comment cterm=italic gui=italic hi BadWhitespace ctermbg=lightblue guibg=lightblue set termguicolors -"let g:molokai_original = 1 -let g:rehash256 = 1 -colorscheme molokai +let g:gruvbox_contrast_dark = 'hard' +colorscheme gruvbox let g:rainbow_active = 1 @@ -72,12 +71,12 @@ autocmd! User GoyoLeave Limelight! let $FZF_DEFAULT_COMMAND='fd -H -L --ignore-file ~/.config/local/fd' command! -bang -nargs=? -complete=dir Files - \ call fzf#vim#files(, {'options': ['-e', '--layout=reverse', '--preview', 'bat --color=always --style=plain --theme=Monokai\ Extended {}']}, 0) + \ call fzf#vim#files(, {'options': ['-e', '--layout=reverse', '--preview', 'bat --color=always --style=plain --theme=gruvbox {}']}, 0) command! -bang -nargs=? -complete=dir Colors \ call fzf#vim#colors({'options': ['-e', '--layout=reverse', '--preview', '']}, 0) let g:lightline = { - \ 'colorscheme': 'powerlineish', + \ 'colorscheme': 'gruvbox', \ 'active': { \ 'left': [ [ 'mode', 'paste' ], \ [ 'readonly', 'filename' ] ], diff --git a/zsh/zshrc b/zsh/zshrc index 876348a..ac19079 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -22,7 +22,7 @@ if [ -f $XDG_CONFIG_HOME/fzf/fzf.zsh ]; then source $XDG_CONFIG_HOME/fzf/fzf.zsh export FZF_DEFAULT_COMMAND='fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd' export FZF_CTRL_T_COMMAND='fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd' - export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=Monokai\ Extended {}'" + export FZF_DEFAULT_OPTS="--multi -e --ansi --layout=reverse --preview='bat --color=always --tabs=2 --style=plain --theme=gruvbox {}'" export FZF_CTRL_R_OPTS="-e --ansi --layout=reverse --preview=''" _fzf_compgen_path() { fd -H -L --ignore-file $XDG_CONFIG_HOME/local/fd . "$1"