diff --git a/ncmpcppconfig b/ncmpcppconfig
index e3f77ae..70b2bab 100644
--- a/ncmpcppconfig
+++ b/ncmpcppconfig
@@ -1 +1,2 @@
 execute_on_song_change = ~/.dotfiles/bin/songinfo
+allow_for_physical_item_deletion = yes
diff --git a/vimrc b/vimrc
index b144c40..093be3e 100644
--- a/vimrc
+++ b/vimrc
@@ -7,6 +7,9 @@ command! W execute 'w !sudo tee % > /dev/null' <bar> edit!
 nnoremap <buffer> <Leader>mm <cmd>make<CR>
 nnoremap <buffer> <Leader>md :Termdebug<CR>
 
+set foldmethod=syntax
+set foldlevelstart=0
+
 set showcmd
 
 set ignorecase
@@ -23,6 +26,7 @@ set tabstop=4
 set shiftwidth=4
 set autoindent
 set smartindent
+set tags=./tags,tags;$HOME
 
 
 packadd! termdebug
@@ -43,30 +47,8 @@ call plug#begin()
 Plug 'stevearc/vim-arduino'
 Plug 'ycm-core/YouCompleteMe'
 Plug 'ludovicchabant/vim-gutentags'
-Plug 'lervag/vimtex'
-Plug 'ervandew/supertab'
-Plug 'sirver/ultisnips'
+Plug 'craigemery/vim-autotag'
+Plug 'Raimondi/delimitMate'
 
 call plug#end()
 
-" make YCM compatible with UltiSnips (using supertab)
-let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
-let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
-let g:SuperTabDefaultCompletionType = '<C-n>'
-
-" better key bindings for UltiSnipsExpandTrigger
-let g:UltiSnipsExpandTrigger = "<tab>"
-let g:UltiSnipsJumpForwardTrigger = "<tab>"
-let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
-
-" latex shit
-let g:tex_flavor='latex'
-let g:vimtex_view_method='zathura'
-let g:vimtex_quickfix_mode=0
-set conceallevel=1
-let g:tex_conceal='abdmg'
-
-if !exists('g:ycm_semantic_triggers')
-    let g:ycm_semantic_triggers = {}
-endif
-au VimEnter * let g:ycm_semantic_triggers.tex=g:vimtex#re#youcompleteme