diff options
-rw-r--r-- | doc/gitignore | 50 | ||||
-rw-r--r-- | doc/shortcuts.txt | 4 | ||||
-rw-r--r-- | vimrc | 18 |
3 files changed, 70 insertions, 2 deletions
diff --git a/doc/gitignore b/doc/gitignore new file mode 100644 index 0000000..1d8dd28 --- /dev/null +++ b/doc/gitignore | |||
@@ -0,0 +1,50 @@ | |||
1 | # Byte-compiled / optimized / DLL files | ||
2 | __pycache__/ | ||
3 | *.py[cod] | ||
4 | |||
5 | # C extensions | ||
6 | *.so | ||
7 | |||
8 | # Distribution / packaging | ||
9 | bin/ | ||
10 | build/ | ||
11 | develop-eggs/ | ||
12 | dist/ | ||
13 | eggs/ | ||
14 | lib/ | ||
15 | lib64/ | ||
16 | parts/ | ||
17 | sdist/ | ||
18 | var/ | ||
19 | *.egg-info/ | ||
20 | .installed.cfg | ||
21 | *.egg | ||
22 | |||
23 | # Installer logs | ||
24 | pip-log.txt | ||
25 | pip-delete-this-directory.txt | ||
26 | |||
27 | # Unit test / coverage reports | ||
28 | .tox/ | ||
29 | .coverage | ||
30 | .cache | ||
31 | nosetests.xml | ||
32 | coverage.xml | ||
33 | |||
34 | # Translations | ||
35 | *.mo | ||
36 | |||
37 | # Mr Developer | ||
38 | .mr.developer.cfg | ||
39 | .project | ||
40 | .pydevproject | ||
41 | |||
42 | # Rope | ||
43 | .ropeproject | ||
44 | |||
45 | # Django stuff: | ||
46 | *.log | ||
47 | *.pot | ||
48 | |||
49 | # Sphinx documentation | ||
50 | docs/_build/ | ||
diff --git a/doc/shortcuts.txt b/doc/shortcuts.txt index 9162df8..540f086 100644 --- a/doc/shortcuts.txt +++ b/doc/shortcuts.txt | |||
@@ -1,3 +1,5 @@ | |||
1 | :viusage = summary of all keyboard shortcuts | ||
2 | :options = shows currently :set options (with descriptions) | ||
1 | leader key = usually set to backslash expects a quick command | 3 | leader key = usually set to backslash expects a quick command |
2 | 4 | ||
3 | 5 | ||
@@ -61,6 +63,8 @@ dp = put changes from current window into the other | |||
61 | ]c = jump to the next change | 63 | ]c = jump to the next change |
62 | [c = jump to the prevous change | 64 | [c = jump to the prevous change |
63 | zR = opens all folds (unfold all) | 65 | zR = opens all folds (unfold all) |
66 | zE = eliminates all folds | ||
67 | z= = show spellcheck suggestions | ||
64 | 68 | ||
65 | [vim modeline] | 69 | [vim modeline] |
66 | the last line can be a mode line, which holds settings like tab width: | 70 | the last line can be a mode line, which holds settings like tab width: |
@@ -59,7 +59,7 @@ let g:airline_theme='base16' | " specifies which colors | |||
59 | " Additional: ========================================. | 59 | " Additional: ========================================. |
60 | Plug 'sheerun/vim-polyglot' " better syntax highlighting/indentation for multiple languages | 60 | Plug 'sheerun/vim-polyglot' " better syntax highlighting/indentation for multiple languages |
61 | Plug 'taglist-plus' " quick code navigator | 61 | Plug 'taglist-plus' " quick code navigator |
62 | nnoremap <C-l> :TlistToggle<CR>| " bind TagList to Hotkey Ctrl+L | 62 | nnoremap <leader>l :TlistToggle<CR>| " bind TagList to Hotkey Ctrl+L |
63 | 63 | ||
64 | " Autocompleter: =====================================. | 64 | " Autocompleter: =====================================. |
65 | Plug 'Valloric/MatchTagAlways' | 65 | Plug 'Valloric/MatchTagAlways' |
@@ -86,6 +86,11 @@ let g:jedi#completions_enabled = 0 " we do not need completio | |||
86 | let g:jedi#show_call_signatures = 1 " which sadly does not support signatures like jedi | 86 | let g:jedi#show_call_signatures = 1 " which sadly does not support signatures like jedi |
87 | let g:jedi#show_call_signatures_delay = 0 | 87 | let g:jedi#show_call_signatures_delay = 0 |
88 | let g:jedi#auto_vim_configure = 0 | 88 | let g:jedi#auto_vim_configure = 0 |
89 | let g:pymode_rope = 0 " https://github.com/davidhalter/jedi-vim/issues/163 | ||
90 | " autocmd FileType python jedi.preload_module('os', 'sys', 'math') | ||
91 | " let g:pymode_options_max_line_length = 120 | ||
92 | " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301' | ||
93 | |||
89 | Plug 'SirVer/ultisnips' " replaces loremipsum (and many more) | 94 | Plug 'SirVer/ultisnips' " replaces loremipsum (and many more) |
90 | Plug 'honza/vim-snippets' " dependency of ultisnips | 95 | Plug 'honza/vim-snippets' " dependency of ultisnips |
91 | " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe. | 96 | " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe. |
@@ -132,6 +137,12 @@ vnoremap > >gv | |||
132 | nnoremap <C-Tab> :bn<CR>| " lets one use CTRL+Tab to switch between buffers | 137 | nnoremap <C-Tab> :bn<CR>| " lets one use CTRL+Tab to switch between buffers |
133 | nnoremap <C-S-Tab> :bp<CR>| " use CTRL+Shift+Tab to switch to previous buffers | 138 | nnoremap <C-S-Tab> :bp<CR>| " use CTRL+Shift+Tab to switch to previous buffers |
134 | 139 | ||
140 | |||
141 | inoremap <C-Backspace> <C-W>| " Bind CTRL+Backspace to vims version (CTRL+W) in insert mode | ||
142 | |||
143 | |||
144 | |||
145 | |||
135 | " settings ============================================. | 146 | " settings ============================================. |
136 | " set shell=/bin/bash | " many scripts rely on bash, but its path varies why it is commented out here | 147 | " set shell=/bin/bash | " many scripts rely on bash, but its path varies why it is commented out here |
137 | set noshowmode | " because we are using some powerline derivat | 148 | set noshowmode | " because we are using some powerline derivat |
@@ -160,6 +171,7 @@ set spell spelllang=en,de | " enable spell checker | |||
160 | set nostartofline | " when scrolling: do not move the cursor to column 1 | 171 | set nostartofline | " when scrolling: do not move the cursor to column 1 |
161 | set thesaurus+=/home/max/.vim/thesaurus/php.txt | 172 | set thesaurus+=/home/max/.vim/thesaurus/php.txt |
162 | set hlsearch | " highlights all search matches (not as performant!) | 173 | set hlsearch | " highlights all search matches (not as performant!) |
174 | set textwidth=100 | " line length (80 used to be default, but...) | ||
163 | 175 | ||
164 | 176 | ||
165 | 177 | ||
@@ -214,7 +226,8 @@ if has("autocmd") | |||
214 | 226 | ||
215 | augroup set_window_title " { | 227 | augroup set_window_title " { |
216 | " autocmd BufWinEnter quickfix setl statusline=%t | 228 | " autocmd BufWinEnter quickfix setl statusline=%t |
217 | autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]" | 229 | " autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]" |
230 | autocmd BufEnter * let &titlestring = "%t|".$USER."@".hostname().":%{expand(\"%:~:.:h\")}%=%y" | ||
218 | 231 | ||
219 | 232 | ||
220 | " set window title for screen(3) | 233 | " set window title for screen(3) |
@@ -223,6 +236,7 @@ if has("autocmd") | |||
223 | set t_fs=\ | 236 | set t_fs=\ |
224 | endif | 237 | endif |
225 | if &term == "screen" || &term == "xterm" | 238 | if &term == "screen" || &term == "xterm" |
239 | set titlelen=40 | ||
226 | set title | 240 | set title |
227 | endif | 241 | endif |
228 | augroup END | 242 | augroup END |