]> git.madduck.net Git - etc/vim.git/blobdiff - .vimrc

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Remove conflict markers accidentally checked in
[etc/vim.git] / .vimrc
diff --git a/.vimrc b/.vimrc
index 92f925f91fe19afaa31c5b69d27b4a3757ae11b3..cc3aad5138e509abed19c0e039ac4e336290d386 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1450,6 +1450,10 @@ let g:netrw_home="$VARDIR/vim"
 filetype plugin indent on
 syntax on
 
+packadd! editorconfig
+packadd! matchit
+packadd! gnupg
+
 " leave the w mark whenever a file is written
 autocmd BufWrite * normal mw
 
@@ -1521,6 +1525,8 @@ iab muc6 80638 München
 
 iab <Leader>→ ➬
 
+iab :thumbsup: 👍️
+
 try
   execute pathogen#infect()
 catch
@@ -1534,15 +1540,5 @@ colorscheme artesanal
 
 let g:is_posix = 1
 
-let g:ycm_add_preview_to_completeopt="popup"
-let g:ycm_autoclose_preview_window_after_completion = 1
-
-let g:UltiSnipsExpandTrigger = "<leader><tab>"
-let g:UltiSnipsJumpForwardTrigger = "<c-]>"
-let g:UltiSnipsJumpBackwardTrigger = "<c-[>"
-let g:UltiSnipsListSnippets = "<leader>q"
-map <F10> :UltiSnipsEdit<cr>
-imap <F10> <esc>:UltiSnipsEdit<cr>
-
 let &cpo=s:cpo_save
 unlet s:cpo_save