Merge branch 'master' of warwick-new.co.uk:vim-conf

This commit is contained in:
Warwick 2023-07-21 13:14:42 +01:00
commit 3945505030
2 changed files with 8 additions and 4 deletions

View file

@ -32,6 +32,7 @@ Plugin 'prabirshrestha/vim-lsp'
Plugin 'mattn/vim-lsp-settings' Plugin 'mattn/vim-lsp-settings'
Plugin 'prabirshrestha/asyncomplete.vim' Plugin 'prabirshrestha/asyncomplete.vim'
Plugin 'tikhomirov/vim-glsl' Plugin 'tikhomirov/vim-glsl'
Plugin 'mattn/calendar-vim'
" All of your Plugins must be added before the following line " All of your Plugins must be added before the following line
call vundle#end() " required call vundle#end() " required
@ -128,7 +129,10 @@ autocmd! BufNewFile,BufRead *.vs,*.fs,*.glsl,*.frag,*.vert set ft=glsl
let g:vimwiki_list = [{'path': '~/.vimwiki/', let g:vimwiki_list = [{'path': '~/.vimwiki/',
\ 'path_html': '~/.vimwiki/HTML', \ 'path_html': '~/.vimwiki/HTML',
\ 'auto_diary_index': 1, \ 'auto_diary_index': 1,
\ 'syntax': 'markdown', 'ext': '.md'}] \ 'syntax': 'markdown', 'ext': '.md',
\ 'links_space_char': '_',
\ 'vimwiki_use_calendar': 1}]
nnoremap <Leader>c :Calendar<CR>
" A little function to insert user input functionality into remaps " A little function to insert user input functionality into remaps
function! TagSearch() function! TagSearch()

6
vimrc
View file

@ -38,9 +38,9 @@ augroup vimrcEx
" For all text files set 'textwidth' to 78 characters. " For all text files set 'textwidth' to 78 characters.
"autocmd FileType text setlocal textwidth=78 "autocmd FileType text setlocal textwidth=78
autocmd FileType asciidoc,vimwiki,tex,text setlocal textwidth=80 autocmd FileType mail,asciidoc,vimwiki,tex,text setlocal textwidth=80
autocmd FileType asciidoc,vimwiki,tex,text setlocal linebreak autocmd FileType mail,asciidoc,vimwiki,tex,text setlocal linebreak
autocmd FileType asciidoc,vimwiki,tex,text setlocal spell spelllang=en_gb autocmd FileType mail,asciidoc,vimwiki,tex,text setlocal spell spelllang=en_gb
augroup END augroup END