Merge remote-tracking branch 'origin'

* origin:
  dot/ipython_config.py: Let's just have one of these for everywhere.

diff --git a/dot/ipython_config.py b/dot/ipython_config.py
new file mode 100644 (file)
index 0000000..f57feec
--- /dev/null
+++ b/dot/ipython_config.py
@@ -0,0 +1,16 @@
+### -*-python -*-
+
+c = get_config()
+
+c.InteractiveShell.autocall = 0
+c.InteractiveShell.autoindent = True
+c.InteractiveShell.automagic = False
+
+c.InteractiveShell.color_info = True
+c.InteractiveShell.colors = 'Linux'
+
+c.Completer.greedy = True
+
+c.TerminalIPythonApp.display_banner = False
+c.InteractiveShellApp.ignore_old_config=True
+c.TerminalInteractiveShell.confirm_exit = False

diff --git a/setup b/setup
index 9ccc5b8f1e7a19332f2a799c4af236afeea0e06b..c4eb953400ce5e74d04a177e86198e68aeb54cf5 100755 (executable)
--- a/setup
+++ b/setup
@@ -135,6 +135,7 @@ dotfiles="
   emacs emacs-calc vm gnus.el ercrc.el
   vimrc mg zile lesskey
   parallel-config:.parallel/config
+  ipython_config.py:.ipython/profile_default/ipython_config.py
   ditz-config
   mailrc signature muttrc
   cgrc tigrc