From 2a2978e7876793770149576801d1d52f62bae8d3 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jdkaplan@mit.edu>
Date: Thu, 13 Apr 2017 18:41:21 -0400
Subject: [PATCH] Update to new tako

---
 tako/completers/passget.tako |  7 ++-----
 tako/config.tako             | 10 +++++++++-
 tako/sympy.tako              |  5 +++++
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 tako/sympy.tako

diff --git a/tako/completers/passget.tako b/tako/completers/passget.tako
index 9dfb7da..be735cc 100644
--- a/tako/completers/passget.tako
+++ b/tako/completers/passget.tako
@@ -1,6 +1,6 @@
 from os.path import isdir, join
 
-ROOT = __tako_env__.get('PASSWORD_STORE_DIR', $HOME + '/.password-store')
+ROOT = ${...}.get('PASSWORD_STORE_DIR', $HOME + '/.password-store')
 SUFFIX = '.gpg'
 
 def make_display(directory):
@@ -13,9 +13,6 @@ def make_display(directory):
     return display
 
 def passget_completer(prefix, line, begidx, endidx, ctx):
-    '''
-    Completes with
-    '''
     if not line.startswith('passget'): return {}
 
     directory = ''
@@ -26,7 +23,7 @@ def passget_completer(prefix, line, begidx, endidx, ctx):
             directory = join(directory, pre_dir)
             prefix = pre
 
-    completions = $(ls @(join(ROOT, directory)))
+    completions = $(ls @(join(ROOT, directory))).splitlines()
 
     display = make_display(directory)
     return {display(i) for i in completions if i.startswith(prefix)}
diff --git a/tako/config.tako b/tako/config.tako
index 4e0376c..874698c 100644
--- a/tako/config.tako
+++ b/tako/config.tako
@@ -7,7 +7,7 @@ def source_many(directory, predicate):
         if not predicate(filename): continue
         source @(join(directory, filename))
 
-is_tako = lambda filename: re.match('^.*\.tako', filename)
+is_tako = (lambda re: lambda filename: re.match('^.*\.tako$', filename))(re)
 source_many('/etc/profile.d', is_tako)
 source_many($HOME + '/.config/tako/completers', is_tako)
 
@@ -39,6 +39,9 @@ def _workon(args, stdin=None):
     ]):
         source @(f)
 
+def _sympy(args, stdin=None):
+    source @($HOME + '/.config/tako/sympy.tako')
+
 $TAKO_SETTINGS.aliases.update({
         'startx': 'ssh-agent startx ; vlock',
         'ls': 'ls --color=auto',
@@ -49,6 +52,8 @@ $TAKO_SETTINGS.aliases.update({
         'vol': 'pulseaudio-ctl set',
         'workon': _workon,
         'octave': 'octave-cli',
+        'bc': 'bc -l',
+        'sympy': _sympy,
 })
 
 if 'TERM' in ${...}:
@@ -81,6 +86,7 @@ if 'TERM' in ${...}:
             return prefix + text + suffix
 
     def git_branch():
+        import re
         ref=$(git symbolic-ref HEAD err> /dev/null)
         if not ref: return None
         prefix = colorize('gray', ':')
@@ -108,3 +114,5 @@ if 'TERM' in ${...}:
 $TAKO_SETTINGS.show_traceback = True
 $TAKO_SETTINGS.traceback_logfile = $HOME + '/tmp/tako.log'
 $TAKO_SETTINGS.case_sensitive_completions = False
+
+completer bash enable out> /dev/null
diff --git a/tako/sympy.tako b/tako/sympy.tako
new file mode 100644
index 0000000..0aaf6f4
--- /dev/null
+++ b/tako/sympy.tako
@@ -0,0 +1,5 @@
+from sympy import *
+
+init_printing(use_unicode=True)
+
+$TAKO_SETTINGS.number_mode = 'python'