diff --git a/.gitmodules b/.gitmodules index d027ca4..4f74af6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,9 +16,6 @@ [submodule "vim/bundle/tagbar"] path = vim/bundle/tagbar url = git://github.com/majutsushi/tagbar -[submodule "vim/bundle/emmet-vim"] - path = vim/bundle/emmet-vim - url = https://github.com/mattn/emmet-vim.git [submodule "vim/bundle/vim-togglelist"] path = vim/bundle/vim-togglelist url = https://github.com/milkypostman/vim-togglelist.git @@ -31,9 +28,6 @@ [submodule "vim/bundle/tcomment_vim"] path = vim/bundle/tcomment_vim url = https://github.com/tomtom/tcomment_vim.git -[submodule "vim/bundle/webapi-vim"] - path = vim/bundle/webapi-vim - url = https://github.com/mattn/webapi-vim.git [submodule "vim/bundle/vim-fugitive"] path = vim/bundle/vim-fugitive url = https://github.com/tpope/vim-fugitive.git diff --git a/README.md b/README.md index ead48ac..51c3ee9 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,6 @@ As usual, to have your system use `vimpager` in place of `less`, you'll need to * `g:powerlinefonts`: **1** = Render the statusline using characters available with powerline-patched fonts | **0** = Render the statusbar with less attractive but more compatible characters available in all fonts (_default_: **0**) * **Custom Settings**: Settings with priority over those set by darkcloud-vimconfig can be added to a file named _vimrc.user_, located in _darkcloud-vimconfig/vim/_ or any of the folders in the runtimepath. * **Custom Plugins**: Pathogen compatible plugins can be cloned or extracted to "darkcloud-vimconfig/vim/bundle.user/", or a folder named "bundle" or "bundle.user" in any of the folders in the runtimepath. -* **Custom Snippets**: To add or override Emmet snippets, create _~/.vim/snippets.json_ and add your own definitions using json like shown in the [Emmet Documentation](http://docs.emmet.io/customization/snippets/). * **File Associations**: To use the file manager in vim to run files with external programs, create "~/.vim/filetypes.vim" and on each line, write an association between a file extension and the program to launch files of that type that looks like: `call vimfiler#set_execute_file('mp4','xdg-open')`. * **Update Script**: (requires: bash+git) Use this to update the project and submodules, as well as handle any required maintenance, generate docs from the pathogen plugins and create missing config scripts with preset values. * **Generate System Tags**: (requires: bash+ctags) Generate a list of ctags for your system libraries in _/usr/include_ and _/usr/local/include_ as well as any folders passed as arguments by running the _gentags_ script. @@ -165,8 +164,6 @@ For a complete list of mappings specific to **darkcloud-vimconfig**, check the l * [nvim-yarp](https://github.com/roxma/nvim-yarp): Yet Another Remote Plugin Framework for Neovim * [vim-hug-neovim-rpc](https://github.com/roxma/vim-hug-neovim-rpc): A compatibility layer for neovim rpc client working on vim8 * [editorconfig-vim](https://github.com/editorconfig/editorconfig-vim): EditorConfig plugin for Vim that auto-configures certain settings when a .editorconfig file is present -* [emmet-vim](https://github.com/mattn/emmet-vim): Support for expanding abbreviations. - * [webapi-vim](https://github.com/mattn/webapi-vim): A web library used by emmet to provide support for custom snippets. * [FastFold](https://github.com/Konfekt/FastFold): Speed up Vim by updating folds only when called-for. * [goyo.vim](https://github.com/junegunn/goyo.vim): Distraction-free writing in Vim. * [incsearch.vim](https://github.com/haya14busa/incsearch.vim): Improved incremental searching for Vim. diff --git a/vim/bundle/emmet-vim b/vim/bundle/emmet-vim deleted file mode 160000 index 60930a9..0000000 --- a/vim/bundle/emmet-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 60930a968d26fc7abf4f8fd5c3926bdcda2dd787 diff --git a/vim/bundle/webapi-vim b/vim/bundle/webapi-vim deleted file mode 160000 index 10b8e92..0000000 --- a/vim/bundle/webapi-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 10b8e926d85a3ab689c2966a3df1139bcb4e197f diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim index 22adc89..9496864 100644 --- a/vim/config/plugins.vim +++ b/vim/config/plugins.vim @@ -22,10 +22,6 @@ scriptencoding utf-8 new|silent e ~/.vim/tags|silent w|q endif - if !filereadable(glob("~/.vim/snippets.json")) - new|silent e ~/.vim/snippets.json|silent w|q - endif - if !filereadable(glob("~/.vim/filetypes.vim")) new|silent e ~/.vim/filetypes.vim|silent w|q endif diff --git a/vim/config/plugins/emmet-vim.vim b/vim/config/plugins/emmet-vim.vim deleted file mode 100644 index 7028322..0000000 --- a/vim/config/plugins/emmet-vim.vim +++ /dev/null @@ -1,6 +0,0 @@ -let g:use_emmet_complete_tag = 1 -let g:user_emmet_mode = 'a' - -if filereadable("~/.vim/snippets.json") - let g:user_emmet_settings = webapi#json#decode(join(readfile(expand('~/.vim/snippets.json')), "\n")) -endif