From af174aee615ad634cd457ee1c842d4aa89f3a59c Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 7 Apr 2020 12:18:21 +0200 Subject: Improve vim syntax for colors --- vifm/.config/vifm/vifmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vifm') diff --git a/vifm/.config/vifm/vifmrc b/vifm/.config/vifm/vifmrc index 7a73409..68f6be2 100644 --- a/vifm/.config/vifm/vifmrc +++ b/vifm/.config/vifm/vifmrc @@ -1,6 +1,6 @@ " Command to open files filetype *.JPG feh %f & -filetype *.exe wine %f & +filetype *.exe wine %f & filetype * xdg-open %f & " Options -- cgit v1.2.3 From 40f469c17357e8185f325aa94a6e90a8a79ff095 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 14 Apr 2020 14:40:55 +0200 Subject: Clean up vimrc --- vifm/.config/vifm/vifmrc | 1 + vim/.vim/spell/en.utf-8.add | 3 ++ vim/.vim/spell/en.utf-8.add.spl | Bin 995 -> 1045 bytes vim/.vimrc | 93 ++-------------------------------------- 4 files changed, 7 insertions(+), 90 deletions(-) (limited to 'vifm') diff --git a/vifm/.config/vifm/vifmrc b/vifm/.config/vifm/vifmrc index 68f6be2..d7219ed 100644 --- a/vifm/.config/vifm/vifmrc +++ b/vifm/.config/vifm/vifmrc @@ -6,6 +6,7 @@ filetype * xdg-open %f & " Options set fastrun set history=100 +set ignorecase set incsearch set sortnumbers set scrolloff=2 diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index ddbe70a..04039f6 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -62,3 +62,6 @@ multimodal Kalman i.e. Stratonovich +colorscheme +colorscheme +plugin diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl index e9828ae..bfb7b60 100644 Binary files a/vim/.vim/spell/en.utf-8.add.spl and b/vim/.vim/spell/en.utf-8.add.spl differ diff --git a/vim/.vimrc b/vim/.vimrc index 896c07d..1a07c9c 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -1,4 +1,5 @@ "" Download vim-plug if necessary {{{1 + if empty(glob('~/.vim/autoload/plug.vim')) silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim @@ -33,7 +34,6 @@ Plug 'lervag/vimtex' Plug 'machakann/vim-highlightedyank' Plug 'majutsushi/tagbar' Plug 'neomake/neomake' -Plug 'scrooloose/nerdtree' Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' } Plug 'terryma/vim-multiple-cursors' Plug 'tommcdo/vim-exchange' @@ -126,9 +126,6 @@ nmap ga (EasyAlign) xmap gl (LiveEasyAlign) nmap gl (LiveEasyAlign) -" Online thesaurus -nnoremap cpd :OnlineThesaurusCurrentWord - " Plug nnoremap ,pi :PlugInstall nnoremap ,pu :PlugUpdate @@ -145,16 +142,6 @@ if &runtimepath =~ 'remembrall' endif let g:remembrall_suffixes = [""] -" LanguageClient -if executable('pyls') - let g:LanguageClient_serverCommands = { 'python': ['pyls'], } -endif - -let g:LanguageClient_diagnosticsEnable = 0 -nnoremap lh :call LanguageClient#textDocument_hover() -nnoremap ld :call LanguageClient#textDocument_definition() -nnoremap lr :call LanguageClient#textDocument_rename() - " Ultisnips nnoremap cps :UltiSnipsEdit @@ -174,30 +161,12 @@ let g:neomake_gcc_args=[ let g:neomake_python_enabled_makers = ['python', 'pylint'] -" Deoplete -let g:deoplete#enable_at_startup = 1 -let g:deoplete#sources#jedi#show_docstring = 1 -if !exists('g:deoplete#omni#input_patterns') - let g:deoplete#omni#input_patterns = {} -endif - -if &runtimepath =~ 'vimtex' - let g:deoplete#omni#input_patterns.tex = g:vimtex#re#deoplete -endif - " FZF.vim let g:fzf_buffers_jump = 1 " Gundo let g:gundo_prefer_python3 = 1 -" Localvimrc -let g:localvimrc_sandbox = 0 -let g:localvimrc_whitelist='/home/*' - -" NerdTree -let g:NERDTreeHijackNetrw = 0 - " Ultisnips let g:UltiSnipsEditSplit="horizontal" let g:UltiSnipsExpandTrigger="" @@ -232,32 +201,6 @@ let g:pilot_mode='wintab' " let g:pilot_key_l='' " let g:pilot_key_p='' -" YouCompleteMe -let g:ycm_key_list_select_completion = ['', ''] -let g:ycm_key_list_previous_completion = ['', ''] -let g:ycm_add_preview_to_completeopt = 0 -let g:ycm_confirm_extra_conf = 0 -let g:ycm_auto_trigger = 1 -if !exists('g:ycm_semantic_triggers') - let g:ycm_semantic_triggers = {} - let g:ycm_semantic_triggers.tex = ['re!\\[A-Za-z]*(ref|cite)[A-Za-z]*([^]]*])?{([^}]*, ?)*' ] -endif - -" Plugins interactions -function! Multiple_cursors_before() - if has("nvim") && &runtimepath =~ 'deoplete' - let b:deoplete_disable_auto_complete = 1 - call deoplete#disable() - endif -endfunction - -function! Multiple_cursors_after() - if has("nvim") && &runtimepath =~ 'deoplete' - let b:deoplete_disable_auto_complete = 0 - call deoplete#enable() - endif -endfunction - "" Vim variables {{{1 let g:netrw_bufsettings='relativenumber' let g:tex_conceal= '' @@ -358,12 +301,6 @@ cnoremap cnoremap cnoremap -" Overwrite unimpaired mappings -nnoremap -nnoremap >b :BufSurfForward -nnoremap :bd! # -nnoremap >B :BufSurfForward:bd! # - " Alternate file nnoremap  nnoremap + :Buffers @@ -386,9 +323,8 @@ nmap co yo "" Autocommands {{{1 augroup vimrc - " autocmd! - " autocmd ColorScheme * source $HOME/dotfiles/vim/.vim/after/colors/colors.vim - + autocmd! + autocmd ColorScheme * highlight String ctermfg=192 guifg=#d7ff87 autocmd BufWritePost *vimrc,*exrc :call feedkeys(":source %\") autocmd BufNewFile,Bufread /tmp/mutt-* setlocal tw=72 autocmd BufWritePre * @@ -534,32 +470,9 @@ endif "" Experimental {{{1 set wildcharm= -nnoremap ,e :e **/* - let $FZF_DEFAULT_OPTS='--layout=reverse' let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6 } } -hi Pmenu ctermfg=3 ctermbg=239 - -" highlight default link LspDiagnosticsError Delimiter -" highlight default link LspDiagnosticsWarning Delimiter -" lua << EOF -" require'nvim_lsp'.pyls.setup{} -" EOF - -" Default Values: -" cmd = { "pyls" } -" filetypes = { "python" } -" log_level = 2 -" root_dir = vim's starting directory -" settings = {} - -" lua < Remembrall('') nnoremap h lua vim.lsp.buf.hover() -- cgit v1.2.3 From e59f7de19940b3b2740be7464f97902fe6ef7179 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 17 Jun 2020 11:32:14 +0200 Subject: Minor changes --- .gitignore | 1 + vifm/.config/vifm/vifmrc | 1 + vim/.vim/spell/en.utf-8.add | 2 ++ vim/.vim/spell/en.utf-8.add.spl | Bin 1045 -> 1067 bytes vim/.vimrc | 10 +++++++--- 5 files changed, 11 insertions(+), 3 deletions(-) (limited to 'vifm') diff --git a/.gitignore b/.gitignore index 475bc4d..810bcb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ plugins/* +tags diff --git a/vifm/.config/vifm/vifmrc b/vifm/.config/vifm/vifmrc index d7219ed..0dd5220 100644 --- a/vifm/.config/vifm/vifmrc +++ b/vifm/.config/vifm/vifmrc @@ -32,6 +32,7 @@ nnoremap gm :bmark nnoremap gb :bmarks nnoremap g :!nvim %f nnoremap r :run +nnoremap T :tree! nnoremap ,b :backup nnoremap ,t :!urxvt & nnoremap ,l :!less %f diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index 04039f6..ed6a065 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -65,3 +65,5 @@ Stratonovich colorscheme colorscheme plugin +hypoellipticity +minorization diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl index bfb7b60..e68d3e5 100644 Binary files a/vim/.vim/spell/en.utf-8.add.spl and b/vim/.vim/spell/en.utf-8.add.spl differ diff --git a/vim/.vimrc b/vim/.vimrc index 44bf4db..96eecd9 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -29,13 +29,12 @@ Plug 'junegunn/vim-slash' Plug 'justinmk/vim-dirvish' Plug 'justinmk/vim-sneak' Plug 'kshenoy/vim-signature' -Plug 'lervag/vimtex' +Plug 'lervag/vimtex', {'commit': '8287981'} Plug 'machakann/vim-highlightedyank' Plug 'majutsushi/tagbar' Plug 'mg979/vim-visual-multi' Plug 'neomake/neomake' Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' } -" Plug 'terryma/vim-multiple-cursors' Plug 'tommcdo/vim-exchange' Plug 'tommcdo/vim-ninja-feet' Plug 'tpope/vim-abolish' @@ -77,6 +76,7 @@ Plug 'KKPMW/sacredforest-vim' Plug 'junegunn/seoul256.vim' Plug 'romainl/Apprentice' Plug 'arcticicestudio/nord-vim' +" Plug 'axvr/zepl.vim' call plug#end() "" Plugin configuration {{{1 @@ -144,6 +144,8 @@ if &runtimepath =~ 'remembrall' augroup END endif let g:remembrall_suffixes = [""] +let g:ripple_winpos = "vertical" +let g:ripple_term_name = "term: ripple" " Ultisnips nnoremap cps :UltiSnipsEdit @@ -479,7 +481,8 @@ if has("nvim") endif "" Experimental {{{1 -autocmd Filetype python setl omnifunc=v:lua.vim.lsp.omnifunc +lua require'nvim_lsp'.pyls.setup{} +autocmd Filetype python setlocal omnifunc=v:lua.vim.lsp.omnifunc nnoremap Remembrall('') nnoremap h lua vim.lsp.buf.hover() nnoremap a lua vim.lsp.buf.declaration() @@ -487,6 +490,7 @@ nnoremap d lua vim.lsp.buf.definition() nnoremap i lua vim.lsp.buf.implementation() nnoremap s lua vim.lsp.buf.signature_help() nnoremap t lua vim.lsp.buf.type_definition() +nnoremap lua vim.lsp.stop_client(vim.lsp.get_active_clients()) " highlight LineNr ctermbg=159 ctermfg=27 guibg=#afffff guifg=#005fff " highlight StatusLineNC ctermbg=22 ctermfg=121 guibg=#005f00 guifg=#87ffaf -- cgit v1.2.3