Improve configs

.bin/autoinstall

@@ -21,12 +21,7 @@ _autoinstall_base () {
 		curl -sS "https://starship.rs/install.sh" | BIN_DIR="$HOME/.local/bin" FORCE=1 sh
 	fi
 
-	if [ -x "$(command -v envsubst)" ]
-	then
-		wakatime_cfg="$WAKATIME_HOME/.wakatime.cfg"
-		wakatime_tpl="$wakatime_cfg.tpl"
-		envsubst < "$wakatime_tpl" > "$wakatime_cfg"
-	fi
+	_autoinstall_env "$WAKATIME_HOME/.wakatime.cfg"
 
 	cp -n "$HOME/.ssh/authorized_keys.default" "$HOME/.ssh/authorized_keys"
 
@@ -94,6 +89,13 @@ _autoinstall_archive () {
 	fi
 }
 
+_autoinstall_env () {
+	if [ -x "$(command -v envsubst)" ]
+	then
+		envsubst < "$1.tpl" > "$1"
+	fi
+}
+
 case $1 in
 	all)		_autoinstall_all ;;
 	base)		_autoinstall_base ;;
@@ -101,5 +103,6 @@ case $1 in
 	git)		_autoinstall_git "$2" "$3" ;;
 	file)		_autoinstall_file "$2" "$3" ;;
 	archive)	_autoinstall_archive "$2" "$3" ;;
+	env)		_autoinstall_env "$2" ;;
 	*)			echo "'$1' is not valid" ;;
 esac

.config/vim/vimrc

@@ -11,14 +11,11 @@ call plug#begin('~/.config/vim/plugged')
 	Plug 'scrooloose/nerdtree'
 	Plug 'vim-scripts/DoxygenToolkit.vim'
 	Plug 'drmikehenry/vim-headerguard'
-	"Emmet is a plugin which greatly improves HTML & CSS workflow
-	Plug 'mattn/emmet-vim'
 	Plug 'easymotion/vim-easymotion'
 
 	" Eye-Candy
 	Plug 'machakann/vim-highlightedyank'
 	Plug 'itchyny/lightline.vim'
-	"Plug 'nanotech/jellybeans.vim'
 	Plug 'dracula/vim', { 'as': 'dracula' }
 	Plug 'scrooloose/syntastic'
 	Plug 'Yggdroot/indentLine'