diff options
author | Max Christian Pohle | 2015-09-06 14:35:31 +0200 |
---|---|---|
committer | Max Christian Pohle | 2015-09-06 14:35:31 +0200 |
commit | 4b98671e80723926b811f5655e792ecb57bad45d (patch) | |
tree | 353b1f2af950df17b8afa42765ea1af5af13887d | |
parent | 64436bf70832028052dd278760761230d7d0bc77 (diff) | |
download | vim-karlmarks-4b98671e80723926b811f5655e792ecb57bad45d.tar.bz2 vim-karlmarks-4b98671e80723926b811f5655e792ecb57bad45d.zip |
cleaned up git submodules, added an empty temp/-folder for backup/undo files
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | .gitmodules | 9 | ||||
-rw-r--r-- | doc/readme.md | 1 | ||||
-rw-r--r-- | doc/shortcuts.txt | 4 | ||||
m--------- | indent/tpope | 0 | ||||
m--------- | plugins/Vundle.vim | 0 | ||||
-rw-r--r-- | temp/.keep | 3 | ||||
m--------- | vim-pathogen | 0 | ||||
-rw-r--r-- | vimrc | 2 |
9 files changed, 14 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7b36982 --- /dev/null +++ b/.gitignore | |||
@@ -0,0 +1,2 @@ | |||
1 | /temp/** | ||
2 | !temp/.keep | ||
diff --git a/.gitmodules b/.gitmodules index f17eb62..1eed186 100644 --- a/.gitmodules +++ b/.gitmodules | |||
@@ -1,9 +1,6 @@ | |||
1 | [submodule "vim-pathogen"] | ||
2 | path = vim-pathogen | ||
3 | url = https://github.com/tpope/vim-pathogen.git | ||
4 | [submodule "indent/tpope"] | ||
5 | path = indent/tpope | ||
6 | url = https://gist.github.com/762326.git | ||
7 | [submodule "indent/html5.vim"] | 1 | [submodule "indent/html5.vim"] |
8 | path = indent/html5.vim | 2 | path = indent/html5.vim |
9 | url = https://github.com/othree/html5.vim.git | 3 | url = https://github.com/othree/html5.vim.git |
4 | [submodule "plugins/Vundle.vim"] | ||
5 | path = plugins/Vundle.vim | ||
6 | url = https://github.com/VundleVim/Vundle.vim.git | ||
diff --git a/doc/readme.md b/doc/readme.md new file mode 100644 index 0000000..513fb41 --- /dev/null +++ b/doc/readme.md | |||
@@ -0,0 +1 @@ | |||
<h1>vim configuration</h1> | |||
diff --git a/doc/shortcuts.txt b/doc/shortcuts.txt new file mode 100644 index 0000000..9355433 --- /dev/null +++ b/doc/shortcuts.txt | |||
@@ -0,0 +1,4 @@ | |||
1 | |||
2 | [visual mode] - with selected lines | ||
3 | gq - format text so that it fits in whatever :set textwidth was set | ||
4 | |||
diff --git a/indent/tpope b/indent/tpope deleted file mode 160000 | |||
Subproject bcbd35239db7f26447f1c2323037d20a5219471 | |||
diff --git a/plugins/Vundle.vim b/plugins/Vundle.vim new file mode 160000 | |||
Subproject 0ee36b26e127cda512a8f2852a59e5a5f374c87 | |||
diff --git a/temp/.keep b/temp/.keep new file mode 100644 index 0000000..3d99c12 --- /dev/null +++ b/temp/.keep | |||
@@ -0,0 +1,3 @@ | |||
1 | this directory is meant to store backups and undo files. it improves the vim | ||
2 | experience when working with fuse mounted file systems, because they can get | ||
3 | really slow when doing those things remotely | ||
diff --git a/vim-pathogen b/vim-pathogen deleted file mode 160000 | |||
Subproject b9fb0dfd811004010f5f6903edef42d6004ebea | |||
@@ -15,7 +15,7 @@ let Tlist_Compact_Format = 1 | |||
15 | let Tlist_GainFocus_On_ToggleOpen = 1 | 15 | let Tlist_GainFocus_On_ToggleOpen = 1 |
16 | let Tlist_Close_On_Select = 1 | 16 | let Tlist_Close_On_Select = 1 |
17 | Plugin 'Valloric/YouCompleteMe' | " syntax checker and code completion | 17 | Plugin 'Valloric/YouCompleteMe' | " syntax checker and code completion |
18 | let g:ycm_global_ycm_extra_conf = '/home/max/.vim/_ycm_extra_conf.py' | " fallback, right one should be in the applications path | 18 | let g:ycm_global_ycm_extra_conf = '' | " fallback, right one should be in the applications path |
19 | let g:ycm_confirm_extra_conf = 0 | " disable 'do you really want to execute .py?' | 19 | let g:ycm_confirm_extra_conf = 0 | " disable 'do you really want to execute .py?' |
20 | let g:ycm_key_select_completion = '<Tab>' | " key completion key | 20 | let g:ycm_key_select_completion = '<Tab>' | " key completion key |
21 | let g:ycm_error_symbol = '✖' | " insert this as an error symbol in the gutter bar | 21 | let g:ycm_error_symbol = '✖' | " insert this as an error symbol in the gutter bar |