From fa1be111d1224f9dad7c4c94ff3ab30f64894023 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Sat, 16 Feb 2019 11:44:35 -0500 Subject: added new features goyo, sneak --- modules/ale.vim | 2 +- modules/deoplete.vim | 6 +++++- modules/general.vim | 34 +++++++++++++++++++++++----------- modules/goyo-limelight.vim | 39 +++++++++++++++++++++++++++++++++++++++ modules/language_server.vim | 11 ++++++++--- modules/nerdtree.vim | 26 +++++++++++++++++++++++++- modules/plugins.vim | 30 ++++++++++++++++++++---------- modules/pythonpath.vim | 2 +- modules/relativenums.vim | 11 +++++++++++ 9 files changed, 133 insertions(+), 28 deletions(-) create mode 100644 modules/goyo-limelight.vim create mode 100644 modules/relativenums.vim (limited to 'modules') diff --git a/modules/ale.vim b/modules/ale.vim index 1dd151e5..d2834cbd 100644 --- a/modules/ale.vim +++ b/modules/ale.vim @@ -3,7 +3,7 @@ let g:ale_linters = { \ 'cpp' : ['gcc'], \ 'c' : ['gcc'], \ 'vim' : ['vint'], - \ 'python': ['pyls', 'pydocstyle', 'pycodestyle', 'vulture'], + \ 'python': ['pydocstyle', 'pycodestyle', 'vulture'], \ 'javascript': ['eslint'] \} diff --git a/modules/deoplete.vim b/modules/deoplete.vim index 0db16ded..663a780b 100644 --- a/modules/deoplete.vim +++ b/modules/deoplete.vim @@ -4,7 +4,11 @@ let g:deoplete#complete_method = "omnifunc" let g:deoplete#auto_complete_delay = 0 " let g:deoplete#ignore_sources = ['buffer'] -" : completion. +"better nav for omnicomplete +inoremap ("\") +inoremap ("\") + +": completion. ""inoremap pumvisible() ? "\" : "\" "use TAB as the mapping inoremap diff --git a/modules/general.vim b/modules/general.vim index 0752298d..786152d2 100644 --- a/modules/general.vim +++ b/modules/general.vim @@ -10,6 +10,7 @@ nmap \ xmap \ syntax enable " Enables syntax highlighing +set hidden " Required for specific actions that require multiple buffers set nowrap " display long lines as just one line set encoding=utf-8 " The encoding displayed set fileencoding=utf-8 " The encoding written to file @@ -58,25 +59,25 @@ nnoremap :10split term://bash autocmd BufWinEnter,WinEnter term://* startinsert autocmd BufLeave term://* stopinsert " Toggle tagbar -nnoremap :TagbarToggle +"nnoremap :TagbarToggle " Toggle Line numbers -nnoremap :set nonumber! +"nnoremap :set nonumber! " Toggle NERDTree -nnoremap :NERDTreeToggle +"nnoremap :NERDTreeToggle " Startify -nnoremap :Startify +"nnoremap :Startify " Get rid of highlights after search -nnoremap :nohlsearch +"nnoremap :nohlsearch " Toggle open buffers -nnoremap :BuffergatorToggle +" nnoremap :BuffergatorToggle " For fuzzy finder ""nnoremap :Files " F10 split vertical -nnoremap :vsplit +"nnoremap :vsplit " F11 split horizontal -nnoremap :split +"nnoremap :split " Make current buffer only buffer -nnoremap :only +"nnoremap :only " Remap window switch " Switch to rename for LSP to do add leader ""nnoremap :SearchTasks * @@ -84,12 +85,22 @@ nnoremap :only nnoremap n :NERDTreeToggle nnoremap m :TagbarToggle nnoremap l :set nonumber! +nnoremap o :only nnoremap s :Startify nnoremap w :w -nnoremap b : nnoremap p :pclose +nnoremap bu :BuffergatorToggle +nnoremap gy :Goyo +nnoremap hi :nohlsearch +nnoremap hs :split +nnoremap vs :vsplit +nnoremap gh :call LanguageClient_textDocument_hover() +nnoremap gd :call LanguageClient_textDocument_definition() +nnoremap gr :call LanguageClient_textDocument_rename() +nnoremap gc :call LanguageClient_contextMenu() +nnoremap fr :call LanguageClient_textDocument_references() -" Split edit your vimrc. Type space, v, r in sequence to trigger +" This is a funtion to open any file with (key sequence) fun! OpenConfigFile(file) if (&filetype ==? 'startify') execute 'e ' . a:file @@ -98,6 +109,7 @@ nnoremap p :pclose endif endfun nnoremap in :call OpenConfigFile('~/.config/nvim/init.vim') +nnoremap bashrc :call OpenConfigFile('~/.bashrc') nnoremap h nnoremap j diff --git a/modules/goyo-limelight.vim b/modules/goyo-limelight.vim new file mode 100644 index 00000000..5b46b129 --- /dev/null +++ b/modules/goyo-limelight.vim @@ -0,0 +1,39 @@ + +"Make window a little bigger" +" +let g:goyo_width=100 +let g:goy_height=95 +" +" +" Disable Deoplete " + +function! s:goyo_enter() + + call deoplete#custom#option('auto_complete', v:false) + set spell spelllang=en_us + set wrap + set tw=100 + set noshowcmd + set scrolloff=999 +"" set background=light +"" colorscheme flattened_light + Limelight + " ... +endfunction + +function! s:goyo_leave() + + call deoplete#custom#option('auto_complete', v:true) + set nospell + set wrap! + set showcmd + set scrolloff=5 +"" set background=dark +"" colorscheme Tender + Limelight! + " ... +endfunction + +autocmd! User GoyoEnter nested call goyo_enter() +autocmd! User GoyoLeave nested call goyo_leave() + diff --git a/modules/language_server.vim b/modules/language_server.vim index e9ac06c3..e96c45a7 100644 --- a/modules/language_server.vim +++ b/modules/language_server.vim @@ -9,8 +9,13 @@ let g:LanguageClient_serverCommands = { \ 'javascript.jsx': ['tcp://127.0.0.1:2089'], \ 'python': ['pyls'], \ 'sh': ['bash-language-server', 'start'], + \ 'c' : ['cquery'], + \ 'cpp' : ['cquery'], \ } -nnoremap K :call LanguageClient#textDocument_hover() -nnoremap gd :call LanguageClient#textDocument_definition() -nnoremap :call LanguageClient#textDocument_rename() +nnoremap gh :call LanguageClient_textDocument_hover() +nnoremap gd :call LanguageClient_textDocument_definition() +nnoremap gr :call LanguageClient_textDocument_rename() +nnoremap gc :call LanguageClient_contextMenu() +nnoremap fr :call LanguageClient_textDocument_references() + diff --git a/modules/nerdtree.vim b/modules/nerdtree.vim index e0ba7ea0..e445a189 100644 --- a/modules/nerdtree.vim +++ b/modules/nerdtree.vim @@ -1 +1,25 @@ -let NERDTreeShowHidden = 1 +let NERDTreeShowHidden = 1 " show hidden files + +" automatically close when you open a file" +"let NERDTreeQuitOnOpen = 1 + +" let nvim close when nerdtree is last thing" +autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif + + +" nerdtree will delete buffer of file " + + let NERDTreeAutoDeleteBuffer = 1 + +" if you need help press ? while in nerdtree " +""let NERDTreeMinimalUI = 1 +let NERDTreeDirArrows = 1 + + +"This depends on vim-nerdtree-syntax-highlight" +let g:NERDTreeFileExtensionHighlightFullName = 1 +let g:NERDTreeExactMatchHighlightFullName = 1 +let g:NERDTreePatternMatchHighlightFullName = 1 + +let g:NERDTreeHighlightFolders = 1 " enables folder icon highlighting using exact match +let g:NERDTreeHighlightFoldersFullName = 1 " highlights the folder name diff --git a/modules/plugins.vim b/modules/plugins.vim index 714c6f27..feaa9ed2 100644 --- a/modules/plugins.vim +++ b/modules/plugins.vim @@ -9,10 +9,13 @@ if dein#load_state('~/.config/nvim/dein') call dein#begin('~/.config/nvim/dein') - " Themes - call dein#add('liuchengxu/space-vim-dark') - call dein#add('joshdick/onedark.vim') - call dein#add('morhetz/gruvbox') + " All the Themes + call dein#add('flazz/vim-colorschemes') + " call dein#add('liuchengxu/space-vim-dark') + " call dein#add('joshdick/onedark.vim') + " call dein#add('morhetz/gruvbox') + " Neoterm + call dein#add('kassio/neoterm') call dein#add('jacoborus/tender.vim') " Better Syntax Support call dein#add('sheerun/vim-polyglot') @@ -21,6 +24,9 @@ if dein#load_state('~/.config/nvim/dein') call dein#add('vim-airline/vim-airline-themes') " File manager call dein#add('scrooloose/NERDTree') + " Icons + call dein#add('ryanoasis/vim-devicons') + call dein#add('tiagofumo/vim-nerdtree-syntax-highlight') " Start Screen call dein#add('mhinz/vim-startify') " For ctags @@ -43,16 +49,20 @@ if dein#load_state('~/.config/nvim/dein') " Fuzzy finder call dein#add('junegunn/fzf.vim', { 'dir': '~/.fzf', 'do': './install --all' }) call dein#add('junegunn/fzf') - - - "Git + " Sneak mode " + call dein#add('justinmk/vim-sneak') + ""Git call dein#add('airblade/vim-gitgutter') call dein#add('tpope/vim-fugitive') " BufOnly use :BufOnly to unload all or pass it a single buffer call dein#add('vim-scripts/BufOnly.vim') - " Markdown viewer TODO Fix this stupid thing - "call dein#add('iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' }) - + " Distraction free writing " + call dein#add('junegunn/goyo.vim') + call dein#add('junegunn/limelight.vim') + "Markdown viewer TODO Fix this stupid thing + call dein#add('iamcco/markdown-preview.nvim', { 'do': 'cd app & yarn install' }) +"" call dein#add('iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }}) +"" call dein#add('euclio/vim-markdown-composer') call dein#add('~/.config/nvim/dein/repos/github.com/Shougo/dein.vim') call dein#add('Shougo/deoplete.nvim', {'do': 'UpdateRemotePlugins'}) call dein#add('Shougo/neoinclude.vim') diff --git a/modules/pythonpath.vim b/modules/pythonpath.vim index b0607962..676078bc 100644 --- a/modules/pythonpath.vim +++ b/modules/pythonpath.vim @@ -1 +1 @@ -let g:python3_host_prog = expand('~/Miniconda/envs/neovim/bin/python3.7') +let g:python3_host_prog = expand("~/.miniconda/envs/neovim/bin/python3.7") diff --git a/modules/relativenums.vim b/modules/relativenums.vim new file mode 100644 index 00000000..6451203f --- /dev/null +++ b/modules/relativenums.vim @@ -0,0 +1,11 @@ +function! NumberToggle() + if(&relativenumber == 1) + set number + set norelativenumber + else + set number + set relativenumber + endif +endfunc + +nnoremap rn :call NumberToggle() -- cgit v1.2.3