From abe86d87a7ba897bb13a8fa4016e2b606bd88154 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Thu, 22 Oct 2020 13:16:44 -0500 Subject: [PATCH] chore: update alacritty and neovim config --- .config/alacritty/alacritty.yml | 8 ++++---- .config/nvim/init.vim | 36 ++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 1bd7044..99eea66 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -1,19 +1,19 @@ # Set Default Font font: normal: - family: MesloLGS NF + family: CaskaydiaCove Nerd Font style: Regular bold: - family: MesloLGS NF + family: CaskaydiaCove Nerd Font style: Bold italic: - family: MesloLGS NF + family: CaskaydiaCove Nerd Font style: Italic bold_italic: - family: MesloLGS NF + family: CaskaydiaCove Nerd Font style: Bold Italic # Color Schemes diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 81a7e6d..723c6f5 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,5 +1,21 @@ +" Use 24-bit (true-color) mode in Vim/Neovim when outside tmux. +" If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support +" (see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.) +if (empty($TMUX)) + if (has("nvim")) + " For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 > + let $NVIM_TUI_ENABLE_TRUE_COLOR=1 + endif + " For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 > + " Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd > + " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 > + if (has("termguicolors")) + set termguicolors + endif +endif + " Shortcuts -map :NERDTreeToggle +nnoremap o :NERDTreeToggle nnoremap s :TagbarToggle " Remove Highlight @@ -29,7 +45,6 @@ inoremap coc#refresh() " coc.nvim quick fix nmap qf (coc-fix-current) - " Use tab for trigger completion with characters ahead and navigate. " Used by coc.nvim inoremap @@ -66,7 +81,7 @@ endfunction " CoC Status in LightLine " Used by coc.nvim lightline.nvim let g:lightline = { - \ 'colorscheme': 'molokai', + \ 'colorscheme': 'one', \ 'active': { \ 'left': [ [ 'mode', 'paste' ], \ [ 'cocstatus', 'readonly', 'filename', 'modified' ] ] @@ -94,11 +109,18 @@ nnoremap c :CocList commands " Plugged Plugins call plug#begin(stdpath('data') . '/plugged') -" Activity Tracking -" Plug 'ActivityWatch/aw-watcher-vim' + +" Blue Theme +Plug 'wadackel/vim-dogrun' + +" Indent Detection +Plug 'tpope/vim-sleuth' " One Dark Theme -Plug 'joshdick/onedark.vim' +Plug 'rakr/vim-one' + +" Activity Tracking +" Plug 'ActivityWatch/aw-watcher-vim' " Monokai Theme Plug 'tomasr/molokai' @@ -146,4 +168,4 @@ let g:rustfmt_autosave = 1 " Configuration set noshowmode " Not Needed because we have Lightline -colorscheme molokai +colorscheme one