From f095bde4b5b71e57425b96e035e1bc1a21d64d1d Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Sun, 5 Jul 2020 19:44:10 +0200 Subject: [PATCH] Changed Ranger for NERDTreee plus bump of uncommitted stuff --- init.vim | 51 +++------------------------------------------------ plugins.vim | 40 +++++++++++++++++----------------------- 2 files changed, 20 insertions(+), 71 deletions(-) diff --git a/init.vim b/init.vim index 5a5900a..6c17753 100644 --- a/init.vim +++ b/init.vim @@ -14,50 +14,10 @@ source ~/.config/nvim/plugins.vim let mapleader = "," let maplocalleader = " " -set statusline+=%#warningmsg# -set statusline+=%{SyntasticStatuslineFlag()} -set statusline+=%* - -let g:syntastic_always_populate_loc_list = 1 -let g:syntastic_check_on_wq = 0 - -" Disable auto-opening of location list -let g:syntastic_auto_loc_list = 0 - -" Check on file open -let g:syntastic_check_on_open = 0 - -" Force python3 when using systastic -let g:syntastic_python_checkers=['pylint'] - -nnoremap c :SyntasticCheck - " FILE MANAGER -" Override netrw commands with Dirvish -let g:loaded_netrwPlugin = 1 -command! -nargs=? -complete=dir Explore Dirvish -command! -nargs=? -complete=dir Sexplore belowright split | silent Dirvish -command! -nargs=? -complete=dir Vexplore leftabove vsplit | silent Dirvish - let g:dirvish_mode = ':sort ,^.*[\/],' -" DEOPLETE - -let g:deoplete#enable_at_startup = 1 - -let g:deoplete#omni#functions = {} -let g:deoplete#omni#functions.javascript = [ - \ 'tern#Complete', - \ 'jspc#omni' -\] - -set completeopt=longest,menuone,preview -let g:deoplete#sources = {} -let g:deoplete#sources['javascript.jsx'] = ['file', 'ultisnips', 'ternjs'] - -" SETTINGS - if !has('nvim') setlocal cm=blowfish2 end @@ -134,13 +94,11 @@ noremap :let @/ = "" " Switch between Windows with: Leader w nnoremap w +nnoremap b :b " Re-read buffer and load modelines with: Leader m nnoremap m :doautocmd BufRead -" Open fzf with all files in git with: Leader f -nnoremap f :GFiles - " Fix indentation with: Leader i nnoremap i mzgg=G`z @@ -184,13 +142,11 @@ nnoremap a GA colorscheme onedark let g:airline_theme='onedark' -" PACKAGES -" vim-fish setup +nnoremap - :NERDTreeToggle + syntax enable filetype plugin indent on -" Set up :make to use fish for syntax checking. -autocmd FileType fish compiler fish if has("vms") set nobackup " do not keep a backup file, use versions instead @@ -200,4 +156,3 @@ else set undofile " keep an undo file (undo changes after closing) endif endif - diff --git a/plugins.vim b/plugins.vim index 7fd4d90..30e0e83 100644 --- a/plugins.vim +++ b/plugins.vim @@ -4,15 +4,17 @@ call plug#begin('~/.local/share/nvim/site/plugged') Plug 'joshdick/onedark.vim' Plug 'vim-airline/vim-airline' +" custom operator commands and motions +Plug 'tpope/vim-commentary' +Plug 'kana/vim-textobj-user' +Plug 'kana/vim-textobj-entire' + " Editorconfig support Plug 'sgur/vim-editorconfig' " Sudo support for WW Plug 'lambdalisue/suda.vim' -" File manager -Plug 'justinmk/vim-dirvish' - " Git integration and git grepping Plug 'tpope/vim-fugitive' Plug 'vim-scripts/gitignore.vim' @@ -24,34 +26,26 @@ Plug 'tpope/vim-unimpaired' Plug 'Valloric/ListToggle' " File type support -Plug 'dag/vim-fish', { 'for': 'fish' } Plug 'wlangstroth/vim-racket', { 'for': 'scheme' } Plug 'leafgarland/typescript-vim', { 'for': 'typescript' } -Plug 'mboughaba/i3config.vim', { 'for': 'i3config' } - -" Syntax checking -Plug 'vim-syntastic/syntastic' " Dustjs highlight Plug 'jimmyhchan/dustjs.vim' -" Completion engine -if has('nvim') - Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } -else - Plug 'Shougo/deoplete.nvim' - Plug 'roxma/nvim-yarp' - Plug 'roxma/vim-hug-neovim-rpc' -endif +"LanguageServer implementation +Plug 'dense-analysis/ale' -" Competion language support -Plug 'SirVer/ultisnips' -Plug 'honza/vim-snippets' +Plug 'rbgrouleff/bclose.vim' -Plug 'carlitux/deoplete-ternjs', { 'for': ['javascript', 'javascript.jsx'] } -Plug 'othree/jspc.vim', { 'for': ['javascript', 'javascript.jsx'] } - -Plug 'deoplete-plugins/deoplete-jedi' " Python (pip install jedi) +" Commands like :Delete :Move for both filesystem and buffers +Plug 'tpope/vim-eunuch' +" File manager +Plug 'preservim/nerdtree' +" File manager icons +Plug 'ryanoasis/vim-devicons' +" Start screen +Plug 'mhinz/vim-startify' call plug#end() +