diff --git a/.config/nvim/after/plugin/coc.vim b/.config/nvim/after/plugin/coc.vim index c23d253..349caa4 100755 --- a/.config/nvim/after/plugin/coc.vim +++ b/.config/nvim/after/plugin/coc.vim @@ -24,20 +24,20 @@ else set signcolumn=yes endif -" Use tab for trigger completion with characters ahead and navigate. -" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by -" other plugin before putting this into your config. -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? "\" : "\" - function! s:check_back_space() abort let col = col('.') - 1 return !col || getline('.')[col - 1] =~# '\s' endfunction +" Use tab for trigger completion with characters ahead and navigate. +" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by +" other plugin before putting this into your config. +" inoremap +" \ pumvisible() ? "\" : +" \ check_back_space() ? "\" : +" \ coc#refresh() +" inoremap pumvisible() ? "\" : "\" + " Use to trigger completion. if has('nvim') inoremap coc#refresh() diff --git a/.config/nvim/after/plugin/keys.vim b/.config/nvim/after/plugin/keys.vim index 13e8af5..14d3b6e 100755 --- a/.config/nvim/after/plugin/keys.vim +++ b/.config/nvim/after/plugin/keys.vim @@ -86,13 +86,25 @@ if !exists('g:vscode') " list and select buffer nnoremap bg :ls:buffer + " TELESCOPE + " Find files using Telescope command-line sugar. + nnoremap ff Telescope find_files + nnoremap fg Telescope live_grep + + " Maps display of current buffers + nnoremap Telescope buffers + nnoremap fb Telescope buffers + nnoremap fh Telescope help_tags + + " Telescope project + nnoremap fp :Telescope project " Start terminal in insert mode - au BufEnter * if &buftype == 'terminal' | :startinsert | endif - nnoremap tt :terminal - nnoremap tv :vnew:terminal - nnoremap th :new:terminal - tnoremap q + " au BufEnter * if &buftype == 'terminal' | :startinsert | endif + " nnoremap tt :terminal + " nnoremap tv :vnew:terminal + " nnoremap th :new:terminal + " tnoremap q let s:hidden_all = 0 @@ -119,5 +131,30 @@ if !exists('g:vscode') endif endfunction - nnoremap h :call ToggleHiddenAll() + " nnoremap h :call ToggleHiddenAll() + + nnoremap :FloatermNew --height=0.4 --width=0.98 --wintype=floating --position=bottom --autoclose=2 --title= + tnoremap :FloatermNew --height=0.4 --width=0.98 --wintype=floating --position=bottom --autoclose=2 --title= + nnoremap :FloatermPrev + tnoremap :FloatermPrev + nnoremap :FloatermNext + tnoremap :FloatermNext + inoremap :FloatermToggle + nnoremap :FloatermToggle + tnoremap :FloatermToggle + tnoremap + nnoremap :FloatermSend + vnoremap :FloatermSend + + " Automatic formatting for Julia files + autocmd FileType julia nnoremap :JuliaFormatterFormat + + " Maps quit + noremap q :q + + " Maps quit all + noremap :qa + + " Maps write + nnoremap w :w end diff --git a/.config/nvim/after/plugin/settings.vim b/.config/nvim/after/plugin/settings.vim index 15c6dc1..b0ef540 100755 --- a/.config/nvim/after/plugin/settings.vim +++ b/.config/nvim/after/plugin/settings.vim @@ -12,6 +12,9 @@ set relativenumber set scrolloff=8 set termguicolors +" Set tabstop and shiftwidth to 4 spaces +set expandtab ts=4 sw=4 ai + " hide mode as it's shown in lightline set noshowmode diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index e0d6ccd..ab6f7ec 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -2,21 +2,21 @@ call plug#begin() Plug 'airblade/vim-gitgutter' -Plug 'andymass/vim-matchup' +" Plug 'andymass/vim-matchup' Plug 'editorconfig/editorconfig-vim' -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } -Plug 'junegunn/fzf.vim' + Plug 'junegunn/vim-easy-align' + +" Multiple cursors for editing Plug 'mg979/vim-visual-multi', {'branch': 'master'} Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'tpope/vim-abolish' -Plug 'tpope/vim-commentary' Plug 'tpope/vim-fugitive' Plug 'tpope/vim-surround' Plug 'edkolev/tmuxline.vim' Plug 'majutsushi/tagbar' -let g:tagbar_ctags_bin = '/usr/local/Cellar/universal-ctags/HEAD-b743975/bin/ctags' +let g:tagbar_ctags_bin = '/usr/local/bin/ctags' Plug 'itchyny/lightline.vim' let g:lightline = { @@ -42,6 +42,13 @@ let g:sneak#label = 1 Plug 'machakann/vim-highlightedyank' let g:highlightedyank_highlight_duration = 100 +" Easy commenting for Vim +Plug 'preservim/nerdcommenter' + +" Command line fuzzy finder / also provides :Maps +Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } +Plug 'junegunn/fzf.vim' + " NERD Tree - tree explorer " https://github.com/scrooloose/nerdtree " http://usevim.com/2012/07/18/nerdtree/ @@ -49,14 +56,25 @@ let g:highlightedyank_highlight_duration = 100 Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } " nerdtree-git-plugin - show git status in NERD Tree -" https://github.com/Xuyuanp/nerdtree-git-plugin +" https://github.com/Xuyuanp/nerdtree-git-plugi Plug 'Xuyuanp/nerdtree-git-plugin' " Enforce editor settings " https://github.com/editorconfig/editorconfig-vim Plug 'editorconfig/editorconfig-vim' -" languages +" Terminal in floating window +Plug 'voldikss/vim-floaterm' + +" Telescope fuzzy find files/grep +Plug 'nvim-lua/popup.nvim' +Plug 'nvim-lua/plenary.nvim' +Plug 'nvim-telescope/telescope.nvim' +Plug 'nvim-telescope/telescope-project.nvim' + +""""""""""""""""""""""""" +" => Language Support +""""""""""""""""""""""""" Plug 'neoclide/jsonc.vim' Plug 'vim-python/python-syntax' @@ -65,6 +83,9 @@ let g:python_highlight_all = 1 Plug 'JuliaEditorSupport/julia-vim' let g:latex_to_unicode_auto = 1 +" Formatting Julia Files +Plug 'kdheepak/JuliaFormatter.vim' + " themes & colorschemes Plug 'challenger-deep-theme/vim', { 'as': 'challenger-deep' } Plug 'dracula/vim', { 'as': 'dracula' } @@ -77,3 +98,26 @@ let g:nord_italic_comments = 1 call plug#end() + +"""""""""""""""""""""""""""""" +" PLUGIN SETTINGS +"""""""""""""""""""""""""""""" + + +"""""""""""""""""""""""""""""" +" VIM-FLOATERM +"""""""""""""""""""""""""""""" + +let g:floaterm_open_command = 'vsplit' + +""""""""""""""""""""" +"JULIA FORMATTER +""""""""""""""""""""" + +let g:JuliaFormatter_options = { + \ 'indent' : 4, + \ 'margin' : 92, + \ 'always_for_in' : v:false, + \ 'whitespace_typedefs' : v:false, + \ 'whitespace_ops_in_indices' : v:true, + \ }