diff --git a/.gitignore b/.gitignore index 018dca2..a55c39e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ termscripts/test.sh .config/tox .vim/plugged +*.o diff --git a/.vimrc b/.vimrc index c0ab853..07bfbaa 100644 --- a/.vimrc +++ b/.vimrc @@ -58,6 +58,9 @@ Plug 'neovimhaskell/haskell-vim' , { 'for': 'haskell' } " " noseke de que se actualiza solo haskell " Plug 'bitc/vim-hdevtools' +" HTML + php +Plug 'captbaritone/better-indent-support-for-php-with-html' + call plug#end() let g:airline_theme='violet' @@ -238,7 +241,8 @@ endf " tab length exceptions on some file types -autocmd FileType html setlocal shiftwidth=4 tabstop=4 softtabstop=4 +autocmd FileType html setlocal shiftwidth=2 tabstop=2 softtabstop=2 +autocmd FileType php setlocal shiftwidth=2 tabstop=2 softtabstop=2 autocmd FileType htmldjango setlocal shiftwidth=4 tabstop=4 softtabstop=4 autocmd FileType javascript setlocal shiftwidth=4 tabstop=4 softtabstop=4 autocmd FileType haskell setlocal shiftwidth=2 tabstop=2 softtabstop=2 diff --git a/bin/cmusd.sh b/bin/cmusd.sh index b26a265..dd89a36 100755 --- a/bin/cmusd.sh +++ b/bin/cmusd.sh @@ -1,7 +1,6 @@ #!/usr/bin/env sh if [ "$(ps -e | grep cmus | wc -l)" -eq "0" ]; then - st -e cmus & - ffplay -fs -autoexit $HOME/Pictures/misc/loading.gif && xdotool key alt+shift+8 + st -c "cmus" -e cmus & fi diff --git a/dwm/dwm-6.2/config.h b/dwm/dwm-6.2/config.h index 3ba2160..0b282f6 100644 --- a/dwm/dwm-6.2/config.h +++ b/dwm/dwm-6.2/config.h @@ -40,6 +40,7 @@ static const Rule rules[] = { { "Workrave", NULL, NULL, ~0, 1, -1 }, { "mpv", "gl", NULL, 1 << 5, 0, -1 }, { "vlc", "vlc", NULL, 1 << 5, 0, -1 }, + { "cmus", NULL, NULL, 1 << 7, 0, -1 }, }; /* layout(s) */ diff --git a/dwm/dwm-6.2/dwm b/dwm/dwm-6.2/dwm deleted file mode 100755 index 3280d94..0000000 Binary files a/dwm/dwm-6.2/dwm and /dev/null differ diff --git a/dwm/dwm-6.2/dwm.o b/dwm/dwm-6.2/dwm.o deleted file mode 100644 index 5ab30b0..0000000 Binary files a/dwm/dwm-6.2/dwm.o and /dev/null differ