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 --- vim/.vim/after/syntax/vim.vim | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 vim/.vim/after/syntax/vim.vim (limited to 'vim/.vim') diff --git a/vim/.vim/after/syntax/vim.vim b/vim/.vim/after/syntax/vim.vim new file mode 100644 index 0000000..f6b389e --- /dev/null +++ b/vim/.vim/after/syntax/vim.vim @@ -0,0 +1,25 @@ +" Modification of default rule: vimHiCtermFg,vimHiCtermBg instead of vimHiCtermFgBg +syntax cluster vimHiCluster remove=vimHiCtermFgBg +syntax cluster vimHiCluster add=vimHiCtermFg,vimHiCtermBg + +" Modification of default rule: @vimHiNmbrFgCluster,@vimHiNmbrBgCluster instead of vimHiNmbr +syntax match vimHiCtermFg /\cctermfg=/ contained nextgroup=@vimHiNmbrFgCluster,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError +syntax match vimHiCtermBg /\cctermbg=/ contained nextgroup=@vimHiNmbrBgCluster,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError + +" Assemble syntax groups +let syntax_groups_fg = "vimHiNmbrFg1" +let syntax_groups_bg = "vimHiNmbrBg1" +for i in range(2, 255) + let syntax_groups_fg = syntax_groups_fg.",vimHiNmbrFg".i + let syntax_groups_bg = syntax_groups_bg.",vimHiNmbrBg".i +endfor + +exe "syntax cluster vimHiNmbrFgCluster contains=".syntax_groups_fg +exe "syntax cluster vimHiNmbrBgCluster contains=".syntax_groups_bg + +for i in range(1, 255) + exe "syntax match vimHiNmbrFg".i." /".i."/ contained" + exe "syntax match vimHiNmbrBg".i." /".i."/ contained" + exe "highlight vimHiNmbrFg".i." ctermfg=".i + exe "highlight vimHiNmbrBg".i." ctermfg=black ctermbg=".i +endfor -- cgit v1.2.3 From dc6a4bfb76eb92519c3d17d790055a546cdb9df5 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 7 Apr 2020 13:13:35 +0200 Subject: Add autocommand to reload colors --- vim/.vim/after/colors/colors.vim | 4 ++++ vim/.vim/after/syntax/vim.vim | 4 ++-- vim/.vimrc | 20 +++++++++++--------- 3 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 vim/.vim/after/colors/colors.vim (limited to 'vim/.vim') diff --git a/vim/.vim/after/colors/colors.vim b/vim/.vim/after/colors/colors.vim new file mode 100644 index 0000000..7c8c10a --- /dev/null +++ b/vim/.vim/after/colors/colors.vim @@ -0,0 +1,4 @@ +for i in range(1, 255) + exe "highlight vimHiNmbrFg".i." ctermfg=".i + exe "highlight vimHiNmbrBg".i." ctermfg=black ctermbg=".i +endfor diff --git a/vim/.vim/after/syntax/vim.vim b/vim/.vim/after/syntax/vim.vim index f6b389e..78e8d37 100644 --- a/vim/.vim/after/syntax/vim.vim +++ b/vim/.vim/after/syntax/vim.vim @@ -5,6 +5,8 @@ syntax cluster vimHiCluster add=vimHiCtermFg,vimHiCtermBg " Modification of default rule: @vimHiNmbrFgCluster,@vimHiNmbrBgCluster instead of vimHiNmbr syntax match vimHiCtermFg /\cctermfg=/ contained nextgroup=@vimHiNmbrFgCluster,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError syntax match vimHiCtermBg /\cctermbg=/ contained nextgroup=@vimHiNmbrBgCluster,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError +hi def link vimHiCtermFg vimHiCtermFgBg +hi def link vimHiCtermBg vimHiCtermFgBg " Assemble syntax groups let syntax_groups_fg = "vimHiNmbrFg1" @@ -20,6 +22,4 @@ exe "syntax cluster vimHiNmbrBgCluster contains=".syntax_groups_bg for i in range(1, 255) exe "syntax match vimHiNmbrFg".i." /".i."/ contained" exe "syntax match vimHiNmbrBg".i." /".i."/ contained" - exe "highlight vimHiNmbrFg".i." ctermfg=".i - exe "highlight vimHiNmbrBg".i." ctermfg=black ctermbg=".i endfor diff --git a/vim/.vimrc b/vim/.vimrc index 443a14d..16a8d73 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -382,18 +382,11 @@ nnoremap ,e :E " Unimpaired nmap co yo -"" Colorscheme {{{1 -nnoremap ,c :colorscheme -nnoremap ,cl :set background=light:colorscheme solarized -nnoremap ,cl :set background=dark:colorscheme solarized -nnoremap ,cs :colorscheme seoul256 -nnoremap ,cn :colorscheme nord -set notermguicolors -colo seoul256 - "" Autocommands {{{1 augroup vimrc autocmd! + autocmd ColorScheme * source $HOME/dotfiles/vim/.vim/after/colors/colors.vim + autocmd BufWritePost *vimrc,*exrc :call feedkeys(":source %\") autocmd BufNewFile,Bufread /tmp/mutt-* setlocal tw=72 autocmd BufWritePre * @@ -423,6 +416,15 @@ augroup vimrc autocmd FileType dirvish silent! unmap augroup END +"" Colorscheme {{{1 +nnoremap ,c :colorscheme +nnoremap ,cl :set background=light:colorscheme solarized +nnoremap ,cl :set background=dark:colorscheme solarized +nnoremap ,cs :colorscheme seoul256 +nnoremap ,cn :colorscheme nord +set notermguicolors +colo seoul256 + "" My search {{{1 " http://vim.wikia.com/wiki/Searching_for_files -- cgit v1.2.3 From 1653d28086c07998be4e30e1d3857cb85e59aa0f Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 11 Apr 2020 19:37:11 +0200 Subject: Move auxiliary functions to plugin --- .mrconfig | 5 +++++ vim/.vim/after/colors/colors.vim | 4 ---- vim/.vim/after/syntax/vim.vim | 25 ------------------------ vim/.vimrc | 42 ++++++++-------------------------------- 4 files changed, 13 insertions(+), 63 deletions(-) delete mode 100644 vim/.vim/after/colors/colors.vim delete mode 100644 vim/.vim/after/syntax/vim.vim (limited to 'vim/.vim') diff --git a/.mrconfig b/.mrconfig index 437d1d6..4152e60 100644 --- a/.mrconfig +++ b/.mrconfig @@ -22,3 +22,8 @@ push = git push origin master checkout = git clone 'git@github.com:urbainvaes/vim-darjeeling.git' update = git pull origin master push = git push origin master + +[$HOME/dotfiles/plugins/vim-macaw] +checkout = git clone 'git@github.com:urbainvaes/vim-macaw.git' +update = git pull origin master +push = git push origin master diff --git a/vim/.vim/after/colors/colors.vim b/vim/.vim/after/colors/colors.vim deleted file mode 100644 index 7c8c10a..0000000 --- a/vim/.vim/after/colors/colors.vim +++ /dev/null @@ -1,4 +0,0 @@ -for i in range(1, 255) - exe "highlight vimHiNmbrFg".i." ctermfg=".i - exe "highlight vimHiNmbrBg".i." ctermfg=black ctermbg=".i -endfor diff --git a/vim/.vim/after/syntax/vim.vim b/vim/.vim/after/syntax/vim.vim deleted file mode 100644 index 78e8d37..0000000 --- a/vim/.vim/after/syntax/vim.vim +++ /dev/null @@ -1,25 +0,0 @@ -" Modification of default rule: vimHiCtermFg,vimHiCtermBg instead of vimHiCtermFgBg -syntax cluster vimHiCluster remove=vimHiCtermFgBg -syntax cluster vimHiCluster add=vimHiCtermFg,vimHiCtermBg - -" Modification of default rule: @vimHiNmbrFgCluster,@vimHiNmbrBgCluster instead of vimHiNmbr -syntax match vimHiCtermFg /\cctermfg=/ contained nextgroup=@vimHiNmbrFgCluster,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError -syntax match vimHiCtermBg /\cctermbg=/ contained nextgroup=@vimHiNmbrBgCluster,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError -hi def link vimHiCtermFg vimHiCtermFgBg -hi def link vimHiCtermBg vimHiCtermFgBg - -" Assemble syntax groups -let syntax_groups_fg = "vimHiNmbrFg1" -let syntax_groups_bg = "vimHiNmbrBg1" -for i in range(2, 255) - let syntax_groups_fg = syntax_groups_fg.",vimHiNmbrFg".i - let syntax_groups_bg = syntax_groups_bg.",vimHiNmbrBg".i -endfor - -exe "syntax cluster vimHiNmbrFgCluster contains=".syntax_groups_fg -exe "syntax cluster vimHiNmbrBgCluster contains=".syntax_groups_bg - -for i in range(1, 255) - exe "syntax match vimHiNmbrFg".i." /".i."/ contained" - exe "syntax match vimHiNmbrBg".i." /".i."/ contained" -endfor diff --git a/vim/.vimrc b/vim/.vimrc index 16a8d73..896c07d 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -62,8 +62,9 @@ Plug 'wellle/targets.vim' if isdirectory($HOME."/dotfiles/plugins") Plug '~/dotfiles/plugins/vim-remembrall' Plug '~/dotfiles/plugins/vim-tmux-pilot' - Plug '~/dotfiles/plugins/vim-darjeeling' Plug '~/dotfiles/plugins/vim-ripple' + Plug '~/dotfiles/plugins/vim-darjeeling' + Plug '~/dotfiles/plugins/vim-macaw' endif if has("nvim") @@ -271,7 +272,7 @@ set undodir^=~/.vim/undo// " ^= : prepends to list " // : store absolute path -set complete+=k +" set complete+=k set conceallevel=2 set cursorline set diffopt=filler,vertical,hiddenoff @@ -283,6 +284,7 @@ set ignorecase set lazyredraw set laststatus=2 set mouse=a +" set noequalalways set nojoinspaces set nowrap set path+=$PWD/** @@ -384,8 +386,8 @@ nmap co yo "" Autocommands {{{1 augroup vimrc - autocmd! - autocmd ColorScheme * source $HOME/dotfiles/vim/.vim/after/colors/colors.vim + " autocmd! + " autocmd ColorScheme * source $HOME/dotfiles/vim/.vim/after/colors/colors.vim autocmd BufWritePost *vimrc,*exrc :call feedkeys(":source %\") autocmd BufNewFile,Bufread /tmp/mutt-* setlocal tw=72 @@ -417,13 +419,10 @@ augroup vimrc augroup END "" Colorscheme {{{1 -nnoremap ,c :colorscheme -nnoremap ,cl :set background=light:colorscheme solarized -nnoremap ,cl :set background=dark:colorscheme solarized +nnoremap ,cd :colorscheme darjeeling nnoremap ,cs :colorscheme seoul256 -nnoremap ,cn :colorscheme nord set notermguicolors -colo seoul256 +colo darjeeling "" My search {{{1 @@ -555,17 +554,6 @@ hi Pmenu ctermfg=3 ctermbg=239 " root_dir = vim's starting directory " settings = {} -" if !exists('g:lsp_config_sourced') -" call lsp#add_filetype_config({ -" \ 'filetype': 'python', -" \ 'name': 'pyls', -" \ 'cmd': 'pyls', -" \ 'callbacks': {} -" \ }) -" autocmd Filetype python setl omnifunc=lsp#omnifunc -" let g:lsp_config_sourced = 1 -" endif - " lua < 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() - - -" function! Autocomplete() -" let [l, c] = [getline("."), col(".")] -" if l[c-5:c-2] == "cite" || l[c-4:c-2] == "ref" -" return "{\\" -" endif -" return "{" -" endfunction - -" augroup autocompletion -" autocmd! -" autocmd FileType tex inoremap { Autocomplete() -" augroup END -- 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 'vim/.vim') 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 'vim/.vim') 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 From 53ad321dec265dd2f625197493a9848a7559a410 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 23 Aug 2020 17:50:44 +0200 Subject: Minor changes --- bash/.bashrc | 2 +- surfraw/.surfraw.bookmarks | 2 -- surfraw/.surfraw.conf | 3 --- vim/.vim/spell/en.utf-8.add | 2 ++ vim/.vim/spell/en.utf-8.add.spl | Bin 1067 -> 1111 bytes vim/.vimrc | 49 ++++++++++++++++++++-------------------- zsh/.zshrc | 2 +- 7 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 surfraw/.surfraw.bookmarks delete mode 100644 surfraw/.surfraw.conf (limited to 'vim/.vim') diff --git a/bash/.bashrc b/bash/.bashrc index 542ce53..b5460fc 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -11,5 +11,5 @@ fi # FZF [ -f ~/.fzf.bash ] && source ~/.fzf.bash -FZF_MARKS_PLUGIN=$HOME/Dropbox/projects/fzf-marks/fzf-marks.plugin.bash +FZF_MARKS_PLUGIN=$HOME/dotfiles/plugins/fzf-marks/fzf-marks.plugin.bash [ -f "$FZF_MARKS_PLUGIN" ] && source "$FZF_MARKS_PLUGIN" diff --git a/surfraw/.surfraw.bookmarks b/surfraw/.surfraw.bookmarks deleted file mode 100644 index a46527b..0000000 --- a/surfraw/.surfraw.bookmarks +++ /dev/null @@ -1,2 +0,0 @@ -startpage https://startpage.com/do/search?hmb=1&cat=web&cmd=process_search&language=english_uk&engine0=v1all&query=%s&abp=-1&nj=0&pg=0 -dictionary http://www.dictionary.com/browse/%s diff --git a/surfraw/.surfraw.conf b/surfraw/.surfraw.conf deleted file mode 100644 index 07cedef..0000000 --- a/surfraw/.surfraw.conf +++ /dev/null @@ -1,3 +0,0 @@ -SURFRAW_graphical_browser=/usr/bin/xdg-open -SURFRAW_text_browser=w3m -SURFRAW_graphical=yes diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index ed6a065..b70e5e7 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -67,3 +67,5 @@ colorscheme plugin hypoellipticity minorization +perturbative +documentclass diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl index e68d3e5..459931e 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 22447e8..77189c5 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -89,20 +89,19 @@ nnoremap cpu :GundoToggle nnoremap cp Remembrall('cp') " Fuzzy finder -nnoremap a :Ag -nnoremap b :Buffers -nnoremap C :Colors -nnoremap f :Files -nnoremap g :GitFiles -nnoremap r :History -nnoremap : :History: -nnoremap / :History/ -nnoremap l :BLines -nnoremap a :Ag - -nnoremap :Buffers -nnoremap :Files -nnoremap :GitFiles +nnoremap a :Ag +nnoremap b :Buffers +nnoremap C :Colors +nnoremap f :Files +nnoremap g :GitFiles +nnoremap r :History +nnoremap : :History: +nnoremap / :History/ +nnoremap l :BLines + +nnoremap :Buffers +nnoremap :Files +nnoremap :GitFiles " Fugitive nnoremap gs :Gstatus @@ -481,16 +480,18 @@ if has("nvim") endif "" Experimental {{{1 -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() -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()) +if has("nvim") + 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() + 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()) +endif function Create_floating_buffer() let buffer = nvim_create_buf(1, 0) diff --git a/zsh/.zshrc b/zsh/.zshrc index e54be1c..c1000e0 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -65,8 +65,8 @@ fi source "$HOME/.zsh/zgen/zgen.zsh" FZF_MARKS_PLUGIN_ZSH=$HOME/dotfiles/plugins/fzf-marks/fzf-marks.plugin.zsh -FZF_MARKS_COMMAND='fzf --height 40% --reverse -e' [ -f "$FZF_MARKS_PLUGIN_ZSH" ] && source "$FZF_MARKS_PLUGIN_ZSH" +FZF_MARKS_COMMAND="$FZF_MARKS_COMMAND -e -n 1 -d ' : '" if ! zgen saved; then echo "Creating a zgen save" -- cgit v1.2.3 From 96bfc178286b367b14e6287b3ae6dc57f3e6e2f6 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Thu, 1 Oct 2020 08:40:59 +0100 Subject: [zsh] Fix completion --- vim/.vim/spell/en.utf-8.add | 1 + vim/.vim/spell/en.utf-8.add.spl | Bin 1111 -> 1138 bytes 2 files changed, 1 insertion(+) (limited to 'vim/.vim') diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index b70e5e7..dbb52c2 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -69,3 +69,4 @@ hypoellipticity minorization perturbative documentclass +preconditioner diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl index 459931e..c1471ca 100644 Binary files a/vim/.vim/spell/en.utf-8.add.spl and b/vim/.vim/spell/en.utf-8.add.spl differ -- cgit v1.2.3