diff --git a/.profile b/.profile
index a8063748..29eac02d 100755
--- a/.profile
+++ b/.profile
@@ -25,6 +25,16 @@
 # If it is not, open a bug report at github.com/rehashedsalt/home and I'll take
 # care of it
 
+# Environment variables
+# Use Vim if we have it
+if `which vim > /dev/null 2>&1`; then
+	export EDITOR=`which vim`
+else
+	export EDITOR=`which vi`
+fi
+
+export PATH=$PATH:$HOME/.local/bin
+
 # If emerge exists, add emerge aliases
 if `which emerge > /dev/null 2>&1` ; then
 	alias e-depclean='sudo emerge -a --depclean'
@@ -44,9 +54,6 @@ if [ -d "$HOME/.dotfiles" ]; then
 fi
 
 # Aliases for common utilities
-alias cp='cp -i'
-alias todo='$EDITOR "$HOME/Documents/todo"'
-
 if [ "`uname`" = "Linux" ]; then
 	lsarguments='--color=auto --group-directories-first'
 	alias l="ls -CF  --file-type $lsarguments"
@@ -54,6 +61,8 @@ if [ "`uname`" = "Linux" ]; then
 	alias ls="ls -F $lsarguments"
 	alias ll="ls -AhlF  --file-type $lsarguments"
 	unset lsarguments
+
+	alias rm='rm -I'
 else
 	lsarguments='-F'
 	alias l="ls -$lsarguments"
@@ -62,6 +71,11 @@ else
 	alias ll="ls -Ahl $lsarguments"
 fi
 
+alias cp='cp -i'
+
+# Miscellaneous aliases
+alias todo='$EDITOR "$HOME/Documents/todo"'
+
 alias waitwhat='echo $?'
 
 # Set up a default PS1
@@ -95,6 +109,3 @@ if ! [ "$ZSH_NAME" ]; then
 	export PS1='`_ps1`'
 fi
 
-# Minor configuration settings
-export EDITOR=`which vim`
-export PATH=$PATH:$HOME/.local/bin