diff --git a/.bashrc b/.bashrc
index 5baef2a..d5984bc 100644
--- a/.bashrc
+++ b/.bashrc
@@ -88,6 +88,7 @@ done
 export DOOMWADDIR=~/dist/games/doom/wad
 export DE=generic
 export CLICOLOR=1
+export PYTHONSTARTUP="$HOME/.pythonstartup"
 
 # Disable Wine creating application shortcuts and, most importantly, hijack
 # file associations!
diff --git a/.pythonstartup b/.pythonstartup
new file mode 100644
index 0000000..1283b9e
--- /dev/null
+++ b/.pythonstartup
@@ -0,0 +1,19 @@
+def init_prompt():
+  try:
+    import readline
+    import rlcompleter
+  except ImportError:
+    return
+
+  import os
+  histfile = os.path.join(os.environ.get('HOME', ''), '.pythonhistory')
+  try:
+    readline.read_history_file(histfile)
+  except IOError:
+    pass
+
+  import atexit
+  atexit.register(readline.write_history_file, histfile)
+
+init_prompt()
+del init_prompt
diff --git a/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim
new file mode 100644
index 0000000..ad650e2
--- /dev/null
+++ b/.vim/after/ftplugin/python.vim
@@ -0,0 +1,2 @@
+setlocal shiftwidth=2
+setlocal expandtab