From a00073669da5a5bdbbb5fe3dd0e59b2cafb69de8 Mon Sep 17 00:00:00 2001 From: paul-loedige Date: Wed, 28 Apr 2021 11:25:15 +0200 Subject: [PATCH] changed font (nerdfont) and theme (gruvbox) for terminal and neovim --- neovim/.config/nvim/coc-settings.json | 8 ++++ neovim/.config/nvim/init.vim | 40 ++++++++++-------- termite/.config/termite/config | 59 +++++++++++++-------------- 3 files changed, 60 insertions(+), 47 deletions(-) create mode 100644 neovim/.config/nvim/coc-settings.json diff --git a/neovim/.config/nvim/coc-settings.json b/neovim/.config/nvim/coc-settings.json new file mode 100644 index 0000000..7e1f9ae --- /dev/null +++ b/neovim/.config/nvim/coc-settings.json @@ -0,0 +1,8 @@ +{ + "git.removedSign.text": "✗", + "git.addedSign.hlGroup": "GitGutterAdd", + "git.changedSign.hlGroup": "GitGutterChange", + "git.removedSign.hlGroup": "GitGutterDelete", + "git.topRemovedSign.hlGroup": "GitGutterDelete", + "git.changeRemovedSign.hlGroup": "GitGutterChangeDelete" +} diff --git a/neovim/.config/nvim/init.vim b/neovim/.config/nvim/init.vim index b48d28f..cff1120 100644 --- a/neovim/.config/nvim/init.vim +++ b/neovim/.config/nvim/init.vim @@ -3,22 +3,26 @@ let $MYPLUGDIRECTORY = "~/.config/nvim/plugged/" "plugins call plug#begin($MYPLUGDIRECTORY) -Plug 'scrooloose/nerdtree' " file tree +Plug 'preservim/nerdtree' " file tree +Plug 'Xuyuanp/nerdtree-git-plugin' " git plugin for nerdtree +Plug 'ryanoasis/vim-devicons' " devicons for nerdtree Plug 'luochen1990/rainbow' " rainbow colored parenthesis and brakets -Plug 'itchyny/lightline.vim' " statusline +Plug 'vim-airline/vim-airline' " statusline Plug 'preservim/nerdcommenter' " easier comment management +Plug 'airblade/vim-gitgutter' " show git changes Plug 'neoclide/coc.nvim', {'branch': 'release'} " code completion Plug 'jiangmiao/auto-pairs' " automatic pairs Plug 'machakann/vim-sandwich' " manipulate elements surrounding other elements -Plug 'airblade/vim-gitgutter' " show git changes +Plug 'tpope/vim-fugitive' " git master tool Plug 'vim-scripts/colorizer' " colorize color codes Plug 'honza/vim-snippets' " snippets Plug 'lervag/vimtex' " vimtex +Plug 'morhetz/gruvbox' " gruvbox colorscheme call plug#end() " coc plugins -let g:coc_global_extensions = ['coc-snippets', 'coc-git', 'coc-vimtex'] +let g:coc_global_extensions = ['coc-snippets', 'coc-git', 'coc-vimtex', 'coc-python', 'coc-vimlsp', 'coc-json'] "neovim-remote for vimtex let g:vimtex_compiler_progname = 'nvr' @@ -26,8 +30,10 @@ let g:vimtex_compiler_progname = 'nvr' "vimtex let g:vimtex_view_method = 'zathura' -" lightline +" airline set laststatus=2 +let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tabline#formatter = 'unique_tail' " activate spell-checking set spell @@ -46,6 +52,9 @@ autocmd StdinReadPre * let s:std_in=1 autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif +let NERDTreeShowHidden=1 +" enable nerdfonts for git status in nerdtree +let g:NERDTreeGitStatusUseNerdFonts=1 set nocompatible " disable compatibility to old-time vi set showmatch " show matching brackets. @@ -64,13 +73,16 @@ let maplocalleader=" " " set localleader to space set timeoutlen=1000 " set timeout length "colors -colorscheme default +let g:gruvbox_contrast_dark='hard' +colorscheme gruvbox +set background=dark + "extra specified colors highlight ColorColumn ctermbg=8 highlight clear SignColumn -highlight GitGutterAdd ctermfg=2 -highlight GitGutterChange ctermfg=3 -highlight GitGutterDelete ctermfg=1 +highlight GitGutterAdd ctermfg=142 +highlight GitGutterChange ctermfg=208 +highlight GitGutterDelete ctermfg=124 highlight LineNr ctermfg=7 highlight CursorLineNr ctermfg=7 @@ -89,14 +101,6 @@ augroup numbertoggle autocmd BufEnter,FocusGained,InsertLeave * set relativenumber autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber augroup END -"gitgutter update speed -set updatetime=100 - -"gitgutter signs -let g:gitgutter_sign_added = '+' -let g:gitgutter_sign_modified = '~' -let g:gitgutter_sign_removed = '-' -let g:gitgutter_sign_removed_first_line = '^' "-------------------- "mappings @@ -116,6 +120,8 @@ nnoremap öq :q nnoremap tn :tabnew "show buffers nnoremap b :buffers:buffer +" cycle buffers +nnoremap :bnext "reload settings nnoremap rl :source ~/.config/nvim/init.vim "NERDTree commands diff --git a/termite/.config/termite/config b/termite/.config/termite/config index 5c054c1..953bf40 100644 --- a/termite/.config/termite/config +++ b/termite/.config/termite/config @@ -2,41 +2,40 @@ font = UbuntuMonoNerdFont 14 [colors] +# hard contrast: background = #1d2021 +background = #282828 +# soft contrast: background = #32302f +foreground = #ebdbb2 +foreground_bold = #ebdbb2 -# special -foreground = #f8f8f2 -foreground_bold = #f8f8f2 -cursor = #f8f8f2 -background = rgba(40, 42, 54, 1) +# dark0 + gray +color0 = #282828 +color8 = #928374 -# black -color0 = #000000 -color8 = #4d4d4d +# neutral_red + bright_red +color1 = #cc241d +color9 = #fb4934 -# red -color1 = #ff5555 -color9 = #ff6e67 +# neutral_green + bright_green +color2 = #98971a +color10 = #b8bb26 -# green -color2 = #50fa7b -color10 = #5af78e +# neutral_yellow + bright_yellow +color3 = #d79921 +color11 = #fabd2f -# yellow -color3 = #f1fa8c -color11 = #f4f99d +# neutral_blue + bright_blue +color4 = #458588 +color12 = #83a598 -# blue -color4 = #bd93f9 -color12 = #caa9fa +# neutral_purple + bright_purple +color5 = #b16286 +color13 = #d3869b -# magenta -color5 = #ff79c6 -color13 = #ff92d0 +# neutral_aqua + faded_aqua +color6 = #689d6a +color14 = #8ec07c -# cyan -color6 = #8be9fd -color14 = #9aedfe - -# white -color7 = #bfbfbf -color15 = #e6e6e6 +# light4 + light1 +color7 = #a89984 +color15 = #ebdbb2