add prompt and config reload

Author: ncoop57

ipython/00-init.py

@@ -1,15 +1,12 @@
-import shlex, subprocess
+from IPython.core.magic import register_line_magic
+import os, shlex, subprocess
 
-# Make system commands run in interactive shell and allow executables in PATH to be ran without !
 ip = get_ipython()
-ip.run_line_magic('rehashx', '') # makes it so you don't need ! for executables in your PATH
-ip.system = lambda cmd: ip.system_raw(f'bash -c {shlex.quote("shopt -s expand_aliases; source ~/.bashrc; " + cmd)}') # overwrites ! to run in an interactive shell
-ip.getoutput = lambda cmd: subprocess.run(['bash', '-c', f'shopt -s expand_aliases; source ~/.bashrc; {cmd}'], # overwrites !! to run an interactive shell
+ip.run_line_magic('rehashx', '')
+ip.system = lambda cmd: ip.system_raw(f'bash -c {shlex.quote("shopt -s expand_aliases; source ~/.bashrc; " + cmd)}')
+ip.getoutput = lambda cmd: subprocess.run(['bash', '-c', f'shopt -s expand_aliases; source ~/.bashrc; {cmd}'],
                                           capture_output=True, text=True).stdout.strip().split('\n')
 
-# --- Export builtin support ---
-from IPython.core.magic import register_line_magic
-
 @register_line_magic
 def export(line): ip.run_line_magic('env', line)
 
@@ -23,10 +20,14 @@ def _builtin_transformer(lines):
 
 ip.input_transformers_cleanup.append(_builtin_transformer)
 
-# Import bash aliases into IPython
+@register_line_magic
+def reload_config(line):
+    import glob
+    for f in sorted(glob.glob(os.path.expanduser('~/.ipython/profile_default/startup/*.py'))): ip.run_line_magic('run', f)
+    print('Reloaded startup files')
+
 aliases = ip.getoutput('alias')
 parsed = [[a.split('=', 1)[0].replace('alias ', ''), a.split('=', 1)[1].strip("'")] for a in aliases if '=' in a]
 for name, cmd in parsed:
     try: ip.run_line_magic('alias', f'{name} {cmd}')
-    except: pass  # Skip builtins like 'cd'
-
+    except: pass

ipython/01-prompt.py

@@ -0,0 +1,24 @@
+from IPython.terminal.prompts import Prompts, Token
+import os, subprocess
+
+def _git_branch():
+    r = subprocess.run(['git', 'branch', '--show-current'], capture_output=True, text=True)
+    return r.stdout.strip()
+
+def _venv_name():
+    v = os.environ.get('VIRTUAL_ENV', '')
+    return os.path.basename(v) if v else ''
+
+class PathPrompt(Prompts):
+    def in_prompt_tokens(self):
+        path = os.getcwd().replace(os.path.expanduser('~'), '~')
+        toks = []
+        venv = _venv_name()
+        if venv: toks.append((Token.Generic, f'({venv}) '))
+        toks.append((Token.Prompt, f'{path}'))
+        branch = _git_branch()
+        if branch: toks.append((Token.PromptNum, f' ({branch})'))
+        toks += [(Token.Prompt, ' ['), (Token.PromptNum, str(self.shell.execution_count)), (Token.Prompt, ']: ')]
+        return toks
+
+get_ipython().prompts = PathPrompt(get_ipython())