summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules11
m---------vim/bundle/ag0
m---------vim/bundle/airline0
m---------vim/bundle/ctrlp0
m---------vim/bundle/fugitive0
m---------vim/bundle/gitgutter0
m---------vim/bundle/gnupg0
m---------vim/bundle/neocomplete0
m---------vim/bundle/pathogen0
m---------vim/bundle/syntastic0
-rw-r--r--vimrc6
11 files changed, 13 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index 0b78258..30df90d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
[submodule "pathogen"]
path = vim/bundle/pathogen
- url = git://github.com/tpope/vim-pathogen
+ url = https://github.com/tpope/vim-pathogen
[submodule "tagbar"]
path = vim/bundle/tagbar
- url = git://github.com/majutsushi/tagbar
+ url = https://github.com/majutsushi/tagbar
[submodule "fugitive"]
path = vim/bundle/fugitive
- url = git://github.com/tpope/vim-fugitive.git
+ url = https://github.com/tpope/vim-fugitive.git
[submodule "ag"]
path = vim/bundle/ag
- url = git://github.com/rking/ag.vim.git
+ url = https://github.com/rking/ag.vim.git
[submodule "bufexplorer"]
path = vim/bundle/bufexplorer
url = https://github.com/jlanzarotta/bufexplorer.git
@@ -28,3 +28,6 @@
[submodule "neocomplete"]
path = vim/bundle/neocomplete
url = https://github.com/Shougo/neocomplete.vim.git
+[submodule "gnupg"]
+ path = vim/bundle/gnupg
+ url = https://github.com/jamessan/vim-gnupg.git
diff --git a/vim/bundle/ag b/vim/bundle/ag
-Subproject f755abfb1c4e4e3f59f6cfa25ce16edb5af9e51
+Subproject 6600953fc7c85ca43216abf4765118994bf0cc5
diff --git a/vim/bundle/airline b/vim/bundle/airline
-Subproject cdc6d98a09db60d3dda58815616f78338cbdaa9
+Subproject 06723fc82c6d8cfb9af177a3b3b1ae2c60e3ffa
diff --git a/vim/bundle/ctrlp b/vim/bundle/ctrlp
-Subproject b5d3fe66a58a13d2ff8b6391f4387608496a030
+Subproject 564176f01d7f3f7f8ab452ff4e1f5314de7b098
diff --git a/vim/bundle/fugitive b/vim/bundle/fugitive
-Subproject 0b43b51d7785aeb4002b45ca49cea5aef0d2e98
+Subproject fd36aa9c61e06d71befdbe8931f97137c489b06
diff --git a/vim/bundle/gitgutter b/vim/bundle/gitgutter
-Subproject 1067294cdc379be1deb56074a093b49a8303308
+Subproject ff4f592c582c0c4181f3c7e40977d1c00c392ce
diff --git a/vim/bundle/gnupg b/vim/bundle/gnupg
new file mode 160000
+Subproject 2dfb82f13ea87e36c5df34024d3d2b054b0e72f
diff --git a/vim/bundle/neocomplete b/vim/bundle/neocomplete
-Subproject d2a78075207b97c105041927a125e2cf0b2b0ca
+Subproject 33ef6422753f469bdebfa23184b02a05b348cb3
diff --git a/vim/bundle/pathogen b/vim/bundle/pathogen
-Subproject b4174e4d1a16e7f0c5c6dfca923269a20a9f50c
+Subproject 4d584ea8c85408ca0d68b7b1693f3e2db8aa762
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
-Subproject 7e26d3589ab414155dff2c362a07e9e8bb97082
+Subproject 1f4846fecca79fa6a56f054d40761bd8c63a236
diff --git a/vimrc b/vimrc
index fef7398..062a76c 100644
--- a/vimrc
+++ b/vimrc
@@ -99,6 +99,12 @@ nmap <ESC>[6^ <C-PageDown>
"let perl_fold=1
"let perl_nofold_packages=0
+" GPG settings
+let g:GPGExecutable="gpg2"
+augroup GnuPGExtra
+ autocmd User GnuPG setl foldmethod=marker foldclose=all foldopen=insert foldtext=v:folddashes.getline(v:foldstart)
+augroup END
+
" BufExplorer settings
let g:bufExplorerSplitHorzSize=15
let g:bufExplorerSplitVertSize=40