diff options
author | Max Christian Pohle | 2016-10-02 03:58:37 +0200 |
---|---|---|
committer | Max Christian Pohle | 2016-10-02 03:58:37 +0200 |
commit | 5bedea9656210600c87392cb79295813f59ab1c6 (patch) | |
tree | 42730f28b36e0e0087c8201a4231c362506f8966 | |
parent | 12160cb747a794cdcecba7ecf10ce9e6af7c3f12 (diff) | |
download | vim-karlmarks-5bedea9656210600c87392cb79295813f59ab1c6.tar.bz2 vim-karlmarks-5bedea9656210600c87392cb79295813f59ab1c6.zip |
Improved portability for Linux and FreeBSD
Removed shell setting, because bash's path can vary. Made Vim-Plug the
new default by completely removing Vundle's old 'bundle' folder and
added a gvim-buffer.desktop file which can be 'installed' under
~/.local/share/applications/ to allow xdg-conforming file managers to
files in an already running vim session as buffer
-rw-r--r-- | gvim-buffer.desktop | 10 | ||||
l--------- | plugged | 1 | ||||
-rw-r--r-- | plugged/.info | 1 | ||||
-rw-r--r-- | vimrc | 18 |
4 files changed, 27 insertions, 3 deletions
diff --git a/gvim-buffer.desktop b/gvim-buffer.desktop new file mode 100644 index 0000000..5cd2cbf --- /dev/null +++ b/gvim-buffer.desktop | |||
@@ -0,0 +1,10 @@ | |||
1 | [Desktop Entry] | ||
2 | Type=Application | ||
3 | Name=Gnome Vi IMproved Buffer | ||
4 | Icon=gvim | ||
5 | Comment=Open file in an existing instance of vi and in a new tab | ||
6 | MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; | ||
7 | Exec=gvim -f -N --remote-silent %F | ||
8 | Terminal=false | ||
9 | X-XClassHintResName=VIM | ||
10 | Categories=Utility;TextEditor; | ||
diff --git a/plugged b/plugged deleted file mode 120000 index 92d0b93..0000000 --- a/plugged +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | bundle/ \ No newline at end of file | ||
diff --git a/plugged/.info b/plugged/.info new file mode 100644 index 0000000..8057473 --- /dev/null +++ b/plugged/.info | |||
@@ -0,0 +1 @@ | |||
This file must exist, because git does not allow empty directories to be commited. | |||
@@ -42,13 +42,17 @@ let g:airline_theme='base16' | " specifies which colors | |||
42 | " let g:airline_theme='tomorrow' | " specifies which colorscheme should airline uses | 42 | " let g:airline_theme='tomorrow' | " specifies which colorscheme should airline uses |
43 | 43 | ||
44 | " Additional: ========================================. | 44 | " Additional: ========================================. |
45 | Plug 'loremipsum' | " Sample text generator | ||
46 | Plug 'sheerun/vim-polyglot' | " better syntax highlighting/indentation for multiple languages | 45 | Plug 'sheerun/vim-polyglot' | " better syntax highlighting/indentation for multiple languages |
47 | Plug 'taglist-plus' | " quick code navigator | 46 | Plug 'taglist-plus' | " quick code navigator |
48 | 47 | ||
49 | " Autocompleter: =====================================. | 48 | " Autocompleter: =====================================. |
50 | Plug 'Valloric/MatchTagAlways' | 49 | Plug 'Valloric/MatchTagAlways' |
51 | Plug 'Valloric/YouCompleteMe' | 50 | Plug 'Valloric/YouCompleteMe' |
51 | let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file | ||
52 | let g:ycm_use_ultisnips_completer = 1 " Default 1, just ensure | ||
53 | let g:ycm_seed_identifiers_with_syntax = 1 " Completion for programming language's keyword | ||
54 | let g:ycm_complete_in_comments = 1 " Completion in comments | ||
55 | let g:ycm_complete_in_strings = 1 " Completion in string | ||
52 | Plug 'scrooloose/syntastic' | 56 | Plug 'scrooloose/syntastic' |
53 | set statusline+=%#warningmsg# | 57 | set statusline+=%#warningmsg# |
54 | set statusline+=%{SyntasticStatuslineFlag()} | 58 | set statusline+=%{SyntasticStatuslineFlag()} |
@@ -63,6 +67,16 @@ Plug 'davidhalter/jedi-vim' | " jedi gets used to disp | |||
63 | let g:jedi#completions_enabled = 0 | " we do not need completions, because we have YouCompleteMe | 67 | let g:jedi#completions_enabled = 0 | " we do not need completions, because we have YouCompleteMe |
64 | let g:jedi#show_call_signatures = 1 | " which sadly does not support signatures like jedi | 68 | let g:jedi#show_call_signatures = 1 | " which sadly does not support signatures like jedi |
65 | let g:jedi#show_call_signatures_delay = 0 | 69 | let g:jedi#show_call_signatures_delay = 0 |
70 | let g:jedi#auto_vim_configure = 0 | ||
71 | Plug 'SirVer/ultisnips' | " replaces loremipsum (and many more) | ||
72 | Plug 'honza/vim-snippets' | " dependency of ultisnips | ||
73 | " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe. | ||
74 | "" Ultisnips | ||
75 | let g:UltiSnipsExpandTrigger="<c-tab>" | ||
76 | let g:UltiSnipsListSnippets="<c-s-tab>" | ||
77 | |||
78 | " If you want :UltiSnipsEdit to split your window. | ||
79 | let g:UltiSnipsEditSplit="vertical" | ||
66 | 80 | ||
67 | " Disabled ===========================================. | 81 | " Disabled ===========================================. |
68 | " Plug 'Shougo/neocomplete.vim' | " alternative to YouCompleteMe in some cases | 82 | " Plug 'Shougo/neocomplete.vim' | " alternative to YouCompleteMe in some cases |
@@ -103,7 +117,7 @@ nnoremap <C-S-Tab> :bp<CR>| " use CTRL+Shift+Tab to switch to preview tab | |||
103 | nnoremap <C-l> :TlistToggle<CR>| " bind TagList to Hotkey Ctrl+L | 117 | nnoremap <C-l> :TlistToggle<CR>| " bind TagList to Hotkey Ctrl+L |
104 | 118 | ||
105 | " settings ============================================. | 119 | " settings ============================================. |
106 | set shell=/bin/bash | " many scripts rely on bash, so make this the default | 120 | " set shell=/bin/bash | " many scripts rely on bash, but its path varies why it is commented out here |
107 | set noshowmode | " because we are using some powerline derivat | 121 | set noshowmode | " because we are using some powerline derivat |
108 | set hidden | " allows switiching buffers even if the current buffer contains changes (displays +) | 122 | set hidden | " allows switiching buffers even if the current buffer contains changes (displays +) |
109 | set confirm | " asks 'do you want to save?' | 123 | set confirm | " asks 'do you want to save?' |