4 files changed, 28 insertions(+), 11 deletions(-)

M alacritty/.config/alacritty/alacritty.yml
M nvim/.config/nvim/init.vim
M vim/.vimrc
M zsh/.zshrc

@@ 16,7 16,7 @@ font:
     family: monospace
     style: Bold Italic
 
-  size: 12.0
+  size: 13.0
   use_thin_strokes: true
 
  # Colors (Ayu Dark)

@@ 18,10 18,8 @@ Plug 'godlygeek/tabular'
 Plug 'machakann/vim-sandwich'
 
 Plug 'jlanzarotta/bufexplorer'
-Plug 'scrooloose/nerdtree'
 Plug 'airblade/vim-rooter'
-
-Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+Plug 'scrooloose/NERDTree'
 
 Plug 'marcweber/vim-addon-mw-utils'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }


@@ 106,8 104,6 @@ let g:ale_linters = {
 	\ 'go': ['gopls'],
 	\}
 
-let g:deoplete#enable_at_startup = 1
-
 let g:ale_fixers = {
 \   '*': ['remove_trailing_lines', 'trim_whitespace'],
 \}


@@ 142,8 138,4 @@ autocmd! FileType fzf set laststatus=0 noshowmode noruler
 
 let g:vimwiki_list = [{'path': '~/wiki/',
                      \ 'syntax': 'default', 'ext': '.wiki'}]
-
-call deoplete#custom#option('sources', {
-\ '_': ['ale'],
-\})
 "}}}

@@ 21,11 21,13 @@ Plug 'jlanzarotta/bufexplorer'
 Plug 'airblade/vim-rooter'
 Plug 'preservim/nerdtree'
 
+Plug 'dense-analysis/ale'
+Plug 'prabirshrestha/asyncomplete.vim'
+
 Plug 'marcweber/vim-addon-mw-utils'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'junegunn/fzf.vim'
 Plug 'mattn/emmet-vim'
-Plug 'dense-analysis/ale'
 Plug 'tpope/vim-fugitive'
 Plug 'airblade/vim-gitgutter'
 Plug 'lilydjwg/colorizer'


@@ 118,6 120,13 @@ nnoremap <leader><Space> :Files<enter>
 
 nmap <silent> <C-k> <Plug>(ale_previous_wrap)
 nmap <silent> <C-j> <Plug>(ale_next_wrap)
+
+nmap <silent> <leader>d <Plug>(ale_go_to_definition)
+
+inoremap <expr> <Tab>   pumvisible() ? "\<C-n>" : "\<Tab>"
+inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+inoremap <expr> <cr>    pumvisible() ? "\<C-y>" : "\<cr>"
+
 "}}}
 
 " Misc plugins {{{


@@ 133,4 142,16 @@ autocmd! FileType fzf set laststatus=0 noshowmode noruler
 
 let g:vimwiki_list = [{'path': '~/wiki/',
                      \ 'syntax': 'default', 'ext': '.wiki'}]
+
+
+au User asyncomplete_setup call asyncomplete#register_source(asyncomplete#sources#ale#get_source_options({
+    \ 'priority': 10,
+    \ }))
+
+let g:user_emmet_settings = {
+\ 'typescript' : {
+\     'extends' : 'jsx',
+\ },
+\}
 "}}}
+

@@ 3,6 3,8 @@ export PROMPT='%B%F{240}%~%f%b %# '
 autoload -Uz compinit && compinit
 autoload -Uz promptinit && promptinit
 
+export LC_ALL=en_US.UTF-8
+
 zstyle ':completion:*' menu select
 
 bindkey -v


@@ 15,4 17,6 @@ zle -N down-line-or-beginning-search
 [[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search
 
 export ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR=/usr/local/share/zsh-syntax-highlighting/highlighters
+export FZF_DEFAULT_COMMAND='rg --files'
 
+alias vim='/usr/local/bin/vim'