diff --git a/custompkg/root/usr/local/bin/new-user-setup b/custompkg/root/usr/local/bin/new-user-setup
index 63275c4..f60cfa2 100644
--- a/custompkg/root/usr/local/bin/new-user-setup
+++ b/custompkg/root/usr/local/bin/new-user-setup
@@ -130,6 +130,16 @@ if [ -f $(brew --prefix)/etc/bash_completion ]; then
     . $(brew --prefix)/etc/bash_completion
 fi
 EOF
+#################################################### set sane env preferences
+cat > ~/Library/bashrc.d/400.environment.sh <<'EOF'
+export PAGER=vimpager
+export EDITOR=vim
+export VISUAL=$EDITOR
+EOF
+###################################################### set up helpful aliases
+cat > ~/Library/bashrc.d/500.aliases.sh <<'EOF'
+alias less=vimpager
+EOF
 ################################################################### GPG Agent
 cat > ~/Library/profile.d/900.gpg-agent.sh <<'EOF'
 # check for existing running agent info
@@ -148,7 +158,7 @@ if [[ ! -e $HOME/.gpg-agent-info ]]; then
         --daemon \
         --write-env-file \
         --use-standard-socket \
-        --pinentry-program $HOME/Library/Homebrew/bin/pinentry-mac \
+        --pinentry-program $(brew --prefix)/bin/pinentry-mac \
         2>&1 >/dev/null
 fi
 
@@ -236,6 +246,7 @@ HOMEBREW_PKGS="
 	torsocks
 	unrar
 	unzip
+	vimpager
 	watch
 	wget
 	whatmask