more cleanup

oxyc · Jun 5, 2017 · 90548a6 · 90548a6
1 parent 6b9c4bf
commit 90548a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/dein.toml b/dein.toml
@@ -538,7 +538,7 @@ hook_source = '''
   let g:neocomplete#keyword_patterns['default'] = '\h\w*'
 '''
 
-# Syntax Colors
+# Filetype plugins
 ###########################################################
 
 # TOML syntax highlighting
@@ -551,12 +551,6 @@ hook_source = '''
   autocmd MyAutoCmd FileType toml syntax sync minlines=500
 '''
 
-# CSS3 syntax highlighting
-# https://github.com/hail2u/vim-css3-syntax
-[[plugins]]
-repo = 'hail2u/vim-css3-syntax'
-on_ft = ['css', 'less', 'sass']
-
 # HTML5 syntax highlighting
 # https://github.com/othree/html5.vim
 [[plugins]]
@@ -581,7 +575,7 @@ hook_source = '''
 # https://github.com/skammer/vim-css-color
 [[plugins]]
 repo = 'skammer/vim-css-color'
-on_ft = ['css', 'less', 'sass']
+on_ft = ['css', 'less', 'sass', 'html', 'twig']
 
 # Markdown syntax highlighting
 # https://github.com/tpope/vim-markdown
@@ -628,7 +622,7 @@ hook_source = '''
 [[plugins]]
 repo = 'shawncplus/phpcomplete.vim'
 
-# Twyg syntax highlighting
+# Twig syntax highlighting
 [[plugins]]
 repo = 'beyondwords/vim-twig'
 on_ft = ['twig', 'html.twig']

diff --git a/rc/filetype.rc.vim b/rc/filetype.rc.vim
@@ -45,9 +45,6 @@ augroup MyAutoCmd
   "Sort CSS attributes alphabetically
   "Stolen from https://bitbucket.org/sjl/dotfiles/src/tip/vim/.vimrc
   autocmd FileType less,css,sass,scss nnoremap <buffer> <localleader>s ?{<CR>jV/\v^\s*\}?$<CR>k:sort<CR>:noh<CR>
-  " Autocopmlete {<cr> properly @todo
-  "autocmd FileType less,css inoremap <buffer> {<cr> {}<left><cr><esc>O
-  "au BufNewFile,BufRead *.js inoremap <buffer> {<cr> {}<left><cr><esc>O
 
   " Use <localleader>1/2/3 to add headings.
   autocmd Filetype markdown nnoremap <buffer> <localleader>1 yypVr=