From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 3 May 2016 16:27:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/d24eae26fe96001540a169eb467c4457e82f0b78?hp=5f454d3e0c3c1fbc179aedcedcfe4ee191f171c2

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
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 9ccc5b8..c4eb953 100755
--- 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