diff options
author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2021-06-19 12:27:29 +0200 |
---|---|---|
committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2021-06-19 12:27:29 +0200 |
commit | 78a597c7d48fa85958bc450b5a5179f32c65b348 (patch) | |
tree | 67dcdafb46edb98794193f12df11e5c1710b9cc6 | |
parent | 76556d8c69988f711e1bf5969c1f2d1f92928274 (diff) | |
parent | 82b661813bd623d3ddbcca2d839ba8b3bc3df426 (diff) | |
download | vim-78a597c7d48fa85958bc450b5a5179f32c65b348.tar.gz vim-78a597c7d48fa85958bc450b5a5179f32c65b348.tar.bz2 vim-78a597c7d48fa85958bc450b5a5179f32c65b348.zip |
Merge branch 'master' of git:system/configs/vim
-rw-r--r-- | .gitmodules | 3 | ||||
m--------- | plugged/vim-cpp-modern | 0 | ||||
m--------- | plugged/vim-fakeclip | 0 | ||||
m--------- | plugged/vim-lsp-settings | 0 | ||||
m--------- | plugged/vimtex | 0 | ||||
-rw-r--r-- | spell/en.utf-8.add | 1 | ||||
-rw-r--r-- | spell/fr.utf-8.add | 1 | ||||
-rw-r--r-- | vimrc | 3 |
8 files changed, 8 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 7fbe46a..adf6ba2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "plugged/vimtex"] path = plugged/vimtex url = https://github.com/lervag/vimtex +[submodule "plugged/vim-fakeclip"] + path = plugged/vim-fakeclip + url = https://github.com/kana/vim-fakeclip diff --git a/plugged/vim-cpp-modern b/plugged/vim-cpp-modern -Subproject 3e7b177e4b7c8fd780dfe6a75ea3bb0ab8e7519 +Subproject 1a0d31ff541e115895b6357b203a0969835b321 diff --git a/plugged/vim-fakeclip b/plugged/vim-fakeclip new file mode 160000 +Subproject 59858dabdb55787d7f047c4ab26b45f11ebb533 diff --git a/plugged/vim-lsp-settings b/plugged/vim-lsp-settings -Subproject c30082b35bcff2ca71c785f65903dbc1d24ece0 +Subproject fbb282fce34306e12199bf4de8ea2bfc08907fe diff --git a/plugged/vimtex b/plugged/vimtex -Subproject 0e9d824e4aaec7d2950b6bf3df763a220175a96 +Subproject 6c0c94e985fd0c46dff92205ad3ac661bf82e3a diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index 8da41da..d240742 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -237,3 +237,4 @@ Coxeter holomorphic Picard Lefschetz +Pappalardi diff --git a/spell/fr.utf-8.add b/spell/fr.utf-8.add new file mode 100644 index 0000000..4960fb7 --- /dev/null +++ b/spell/fr.utf-8.add @@ -0,0 +1 @@ +Jaron @@ -75,6 +75,7 @@ call plug#begin() Plug 'lervag/vimtex' Plug 'prabirshrestha/asyncomplete-lsp.vim' Plug 'mattn/vim-lsp-settings' + Plug 'kana/vim-fakeclip' call plug#end() inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>" @@ -83,3 +84,5 @@ inoremap <expr> <cr> pumvisible() ? asyncomplete#close_popup() : "\<cr>" let g:lsp_diagnostics_float_cursor = 1 let g:lsp_document_highlight_enabled = 1 + +let g:fakeclip_provide_clipboard_key_mappings = !empty($WAYLAND_DISPLAY) |