fix bashrc.d directory rename

bash/bash.bashrc

@@ -99,7 +99,7 @@ then
 	}
 fi
 
-if [ -d /etc/bash.bashrc.d ]; then
+if [ -d /etc/bashrc.d ]; then
 	for i in /etc/bashrc.d/*.sh; do
 		if [ -r $i ]; then
 			. $i

bash/bashrc.d/aliases.sh

@@ -18,12 +18,22 @@ fi
 
 # Editors
 alias ed="ed -p': '"
-if [ -x "$(command -v nvim)" ]
+if [ -x "$(command -v nvim)" ] && ! limited_terminal
 then
+	vim_path="$(command -v vim)"
+	vimdiff_path="$(command -v vimdiff)"
+	if [ -x "$vim_path" ]
+	then
+		alias vvim="$vim_path"
+	fi
+	if [ -x "$vimdiff_path" ]
+	then
+		alias vvimdiff="$vimdiff_path"
+	fi
 	alias vim=nvim
 	alias vimdiff="nvim -d"
 fi
-if [ "$(whence -b vi)" -eq /usr/local/bin/ex ]
+if [[ "$(whence -b vi)" == "/usr/local/bin/ex" ]]
 then
 	alias vi='EXINIT="$(inline_exrc $HOME/.exrc)" vi'
 fi