diff --git a/ftdetect/bind.vim b/ftdetect/bind.vim new file mode 100644 index 0000000..1fb2efd --- /dev/null +++ b/ftdetect/bind.vim @@ -0,0 +1,4 @@ + " Bind zone file + autocmd BufNewFile,BufRead *.domain setf bindzone + autocmd BufNewFile,BufRead *.zone setf bindzone + autocmd BufNewFile,BufRead *.priv setf bindzone diff --git a/ftdetect/mako.vim b/ftdetect/mako.vim new file mode 100644 index 0000000..b409a45 --- /dev/null +++ b/ftdetect/mako.vim @@ -0,0 +1,6 @@ +" Mako +augroup mako +autocmd BufRead,BufNewFile *.mako set ft=mako +autocmd BufWinEnter *.mako set ft=mako +autocmd FileType mako set textwidth=0 +augroup end diff --git a/ftdetect/plist.vim b/ftdetect/plist.vim new file mode 100644 index 0000000..1ea1b61 --- /dev/null +++ b/ftdetect/plist.vim @@ -0,0 +1,6 @@ + autocmd BufReadPre,FileReadPre *.plist setf plist + autocmd FileType plist set binary syntax=xml + autocmd BufReadPost *.plist call MyBinaryPlistReadPost() + autocmd FileReadPost *.plist call MyBinaryPlistReadPost() | let b:saveAsBinaryPlist = 0 + autocmd BufWritePre,FileWritePre *.plist call MyBinaryPlistWritePre() + autocmd BufWritePost,FileWritePost *.plist call MyBinaryPlistWritePost() diff --git a/ftplugin/gpg.vim b/ftplugin/gpg.vim new file mode 100644 index 0000000..380238c --- /dev/null +++ b/ftplugin/gpg.vim @@ -0,0 +1,34 @@ + " Transparent editing of gpg encrypted files. + augroup encrypted + au! + " First make sure nothing is written to ~/.viminfo while editing + " an encrypted file. + autocmd BufReadPre,FileReadPre *.gpg,*.asc set viminfo= + " We don't want a swap file, as it writes unencrypted data to disk + autocmd BufReadPre,FileReadPre *.gpg,*.asc set noswapfile + " Switch to binary mode to read the encrypted file + autocmd BufReadPre,FileReadPre *.gpg,*.asc set bin + autocmd BufReadPre,FileReadPre *.gpg,*.asc let ch_save = &ch|set ch=2 + autocmd BufReadPre,FileReadPre *.gpg,*.asc let shsave=&sh + autocmd BufReadPre,FileReadPre *.gpg,*.asc let &sh='sh' + autocmd BufReadPre,FileReadPre *.gpg,*.asc let ch_save = &ch|set ch=2 + autocmd BufReadPost,FileReadPost *.gpg,*.asc '[,']!gpg2 --decrypt --default-recipient-self 2> /dev/null + autocmd BufReadPost,FileReadPost *.gpg,*.asc let &sh=shsave + " Switch to normal mode for editing + autocmd BufReadPost,FileReadPost *.gpg,*.asc set nobin + autocmd BufReadPost,FileReadPost *.gpg,*.asc let &ch = ch_save|unlet ch_save + autocmd BufReadPost,FileReadPost *.gpg,*.asc execute ":doautocmd BufReadPost " . expand("%:r") + " Convert all text to encrypted text before writing + autocmd BufWritePre,FileWritePre *.gpg,*.asc set bin + autocmd BufWritePre,FileWritePre *.gpg,*.asc let shsave=&sh + autocmd BufWritePre,FileWritePre *.gpg,*.asc let &sh='sh' + " GPG Binary + autocmd BufWritePre,FileWritePre *.gpg '[,']!gpg2 --encrypt --default-recipient-self 2>/dev/null + " GPG Ascii armor + autocmd BufWritePre,FileWritePre *.asc '[,']!gpg2 --armor --encrypt --default-recipient-self 2>/dev/null + autocmd BufWritePre,FileWritePre *.gpg,*.asc let &sh=shsave + " Undo the encryption so we are back in the normal text, directly + " after the file has been written. + autocmd BufWritePost,FileWritePost *.gpg,*.asc silent u + autocmd BufWritePost,FileWritePost *.gpg,*.asc set nobin + augroup END diff --git a/ftplugin/javascript.vim b/ftplugin/javascript.vim new file mode 100644 index 0000000..5dbee49 --- /dev/null +++ b/ftplugin/javascript.vim @@ -0,0 +1,3 @@ + " Javascript + autocmd FileType javascript set sw=4 ts=4 sts=4 smarttab expandtab + autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS diff --git a/ftplugin/python.vim b/ftplugin/python.vim new file mode 100644 index 0000000..cf506d6 --- /dev/null +++ b/ftplugin/python.vim @@ -0,0 +1,3 @@ + " Python + autocmd FileType python set textwidth=79 + autocmd FileType python set omnifunc=pythoncomplete#Complete diff --git a/ftplugin/text.vim b/ftplugin/text.vim new file mode 100644 index 0000000..24becca --- /dev/null +++ b/ftplugin/text.vim @@ -0,0 +1,3 @@ + " Plain text + " autocmd BufNewFile,BufRead *.txt setf text + autocmd FileType text set textwidth=78 printfont=:h10 diff --git a/vimrc b/vimrc index b4c7cc1..fb00298 100644 --- a/vimrc +++ b/vimrc @@ -370,36 +370,6 @@ if has("autocmd") " If doing a diff. Upon writing changes to file, automatically update the differences autocmd BufWritePost * if &diff == 1 | diffupdate | endif - " Mako - autocmd! BufRead,BufNewFile *.mako setfiletype mako - autocmd BufWinEnter *.mako setfiletype mako - autocmd FileType mako set textwidth=0 - - " Python - autocmd FileType python set textwidth=79 - autocmd FileType python set omnifunc=pythoncomplete#Complete - - " Plist - autocmd BufReadPre,FileReadPre *.plist setf plist - autocmd FileType plist set binary syntax=xml - autocmd BufReadPost *.plist call MyBinaryPlistReadPost() - autocmd FileReadPost *.plist call MyBinaryPlistReadPost() | let b:saveAsBinaryPlist = 0 - autocmd BufWritePre,FileWritePre *.plist call MyBinaryPlistWritePre() - autocmd BufWritePost,FileWritePost *.plist call MyBinaryPlistWritePost() - - " Plain text - autocmd BufNewFile,BufRead *.txt setf text - autocmd FileType text set textwidth=78 printfont=:h10 - - " Javascript - autocmd FileType javascript set sw=4 ts=4 sts=4 smarttab expandtab - autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS - - " Bind zone file - autocmd BufNewFile,BufRead *.domain setf bindzone - autocmd BufNewFile,BufRead *.zone setf bindzone - - " " Reload .vimrc, after modifications autocmd BufWritePost ~/.vimrc so ~/.vimrc autocmd BufWritePost ~/.vim/vimrc so ~/.vim/vimrc @@ -408,42 +378,6 @@ if has("autocmd") autocmd BufWritePost ~/.vim/gvimrc so ~/.vim/gvimrc endif - - - " Transparent editing of gpg encrypted files. - augroup encrypted - au! - " First make sure nothing is written to ~/.viminfo while editing - " an encrypted file. - autocmd BufReadPre,FileReadPre *.gpg,*.asc set viminfo= - " We don't want a swap file, as it writes unencrypted data to disk - autocmd BufReadPre,FileReadPre *.gpg,*.asc set noswapfile - " Switch to binary mode to read the encrypted file - autocmd BufReadPre,FileReadPre *.gpg,*.asc set bin - autocmd BufReadPre,FileReadPre *.gpg,*.asc let ch_save = &ch|set ch=2 - autocmd BufReadPre,FileReadPre *.gpg,*.asc let shsave=&sh - autocmd BufReadPre,FileReadPre *.gpg,*.asc let &sh='sh' - autocmd BufReadPre,FileReadPre *.gpg,*.asc let ch_save = &ch|set ch=2 - autocmd BufReadPost,FileReadPost *.gpg,*.asc '[,']!gpg2 --decrypt --default-recipient-self 2> /dev/null - autocmd BufReadPost,FileReadPost *.gpg,*.asc let &sh=shsave - " Switch to normal mode for editing - autocmd BufReadPost,FileReadPost *.gpg,*.asc set nobin - autocmd BufReadPost,FileReadPost *.gpg,*.asc let &ch = ch_save|unlet ch_save - autocmd BufReadPost,FileReadPost *.gpg,*.asc execute ":doautocmd BufReadPost " . expand("%:r") - " Convert all text to encrypted text before writing - autocmd BufWritePre,FileWritePre *.gpg,*.asc set bin - autocmd BufWritePre,FileWritePre *.gpg,*.asc let shsave=&sh - autocmd BufWritePre,FileWritePre *.gpg,*.asc let &sh='sh' - " GPG Binary - autocmd BufWritePre,FileWritePre *.gpg '[,']!gpg2 --encrypt --default-recipient-self 2>/dev/null - " GPG Ascii armor - autocmd BufWritePre,FileWritePre *.asc '[,']!gpg2 --armor --encrypt --default-recipient-self 2>/dev/null - autocmd BufWritePre,FileWritePre *.gpg,*.asc let &sh=shsave - " Undo the encryption so we are back in the normal text, directly - " after the file has been written. - autocmd BufWritePost,FileWritePost *.gpg,*.asc silent u - autocmd BufWritePost,FileWritePost *.gpg,*.asc set nobin - augroup END endif """ iTerm 2 Custom cursor shape