diff --git a/clojure_emacs.sh b/clojure_emacs.sh
index c22fd47..9f10d80 100755
--- a/clojure_emacs.sh
+++ b/clojure_emacs.sh
@@ -8,6 +8,11 @@ sudo apt-get update
 sudo apt-get install -y emacs-snapshot git-core rlwrap openjdk-6-jdk tmux \
     curl tree unzip
 
+# dotfiles
+mkdir -p ~/bin/
+cp -r /vagrant/dotfiles/.* ~
+emacs --batch -l .emacs.d/init.el -f package-updates
+
 # Leiningen
 if [ ! -r ~/bin/lein ]; then
     wget -O ~/bin/lein https://github.com/technomancy/leiningen/raw/stable/bin/lein
diff --git a/dotfiles/.emacs.d/eshell/alias b/dotfiles/.emacs.d/eshell/alias
new file mode 100644
index 0000000..eb763c7
--- /dev/null
+++ b/dotfiles/.emacs.d/eshell/alias
@@ -0,0 +1,35 @@
+alias gerp grep
+alias top proced
+alias client-jvm export JAVA_CMD=/usr/lib/jvm/ia32-java-6-sun/bin/java
+alias server-jvm export JAVA_CMD=/usr/lib/jvm/java-6-openjdk/bin/java
+alias lcdt lein clean && lein deps && lein test
+alias lcd lein clean && lein deps
+alias emacs find-file $1
+alias jake jruby -S rake
+alias lh ls -l -h $*
+alias ll ls -l $*
+alias la ls -a $*
+alias l ls -a -l $*
+alias sapti sudo apt-get install $*
+alias saptc apt-cache search $*
+alias sapts apt-cache show $*
+alias saptr sudo apt-get remove $*
+alias saptu sudo apt-get upgrade $*
+alias saptd sudo apt-get update $*
+alias sagi sudo gem install $*
+alias sagr sudo gem uninstall $*
+alias sagd sudo gem source -u
+alias sagc gem search --remote $*
+alias gst git status
+alias gb git branch $*
+alias gbv git branch -v $*
+alias gcm git commit -a -v
+alias gco git checkout $*
+alias clojars lein jar && lein pom && scp pom.xml *jar clojars@clojars.org:
+alias jdk7 export JAVA_CMD=/usr/lib/jvm/java-7-openjdk/jre/bin/java
+alias cdf mkdir -p
+alias glt git log -n 10
+alias kni knife ssh $* -a ec2.public_hostname
+alias kniu knife ssh $* uptime -a ec2.public_hostname
+alias knis knife ssh "role:safe*" $* -a ec2.public_hostname
+alias knisu knife ssh "role:safe*" uptime -a ec2.public_hostname
diff --git a/dotfiles/.emacs.d/init.el b/dotfiles/.emacs.d/init.el
new file mode 100644
index 0000000..4305537
--- /dev/null
+++ b/dotfiles/.emacs.d/init.el
@@ -0,0 +1,25 @@
+(require 'package)
+(add-to-list 'package-archives
+             '("marmalade" . "http://marmalade-repo.org/packages/") t)
+(package-initialize)
+
+(global-set-key (kbd "C-c C-j") 'clojure-jack-in)
+
+(set-face-foreground 'vertical-border
+                     (face-attribute 'vertical-border :background))
+
+(eval-after-load 'hl-line
+  '(set-face-background 'hl-line "darkseagreen2"))
+
+(add-hook 'eshell-mode-hook
+          '(lambda () (fmakunbound 'eshell/sudo)
+             (fmakunbound 'eshell/su)))
+
+(defun package-updates ()
+  (interactive)
+  (package-refresh-contents)
+  (dolist (p '(clojure-mode slime slime-repl clojure-test-mode magit
+                            paredit starter-kit starter-kit-lisp
+                            scpaste idle-highlight-mode))
+    (when (not (package-installed-p p))
+      (package-install p))))