From c12a198bc7867867acaec54b7371501e791bc9ff Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Sun, 16 Jan 2022 03:36:58 +0100
Subject: [PATCH] shell stuff

---
 defaults/main.yaml         |  2 +-
 files/shells/xonsh/xonshrc | 24 +++++++++++++-----------
 vars/main.yaml             |  1 +
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/defaults/main.yaml b/defaults/main.yaml
index 225ade5..f9bce49 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -8,7 +8,7 @@ locales_gen:
   - de_DE.UTF-8
 
 root_ssh_key: false
-root_shell: /usr/bin/xonsh
+root_shell: /usr/bin/fish
 
 debian_distribution: bullseye
 debian_components:
diff --git a/files/shells/xonsh/xonshrc b/files/shells/xonsh/xonshrc
index 1561207..b93f05d 100644
--- a/files/shells/xonsh/xonshrc
+++ b/files/shells/xonsh/xonshrc
@@ -1,13 +1,15 @@
 xontrib load abbrevs coreutils
+
+# title
+$PROMPT_FIELDS['title'] = lambda: '' if 'XDG_SESSION_TYPE' in ${...} && $XDG_SESSION_TYPE=='x11' \
+  else $USER+'@'+$HOSTNAME+':'
+$TITLE = '{current_job:{} | }{title}{cwd}'
+
+# prompt
+$PROMPT_FIELDS['prompt_end'] = lambda: '{INTENSE_RED}#@' if $USER == "root" else '{GREEN}@'
+$PROMPT = lambda: ('' if 'XDG_SESSION_TYPE' in ${...} && $XDG_SESSION_TYPE=='x11' \
+  else ('{INTENSE_GREEN}{user}{WHITE}@{BOLD_WHITE}' if $USER != "root" and $USER != "toor" \
+    else '{BOLD_RED}')+'{hostname}{WHITE}:')+'{BOLD_BLUE}{cwd}{DEFAULT}{gitstatus: [{}]} {prompt_end} '
+
+# multiline prompt
 $MULTILINE_PROMPT=''
-$PROMPT = lambda: '{user}@{hostname}:{cwd} {gitstatus: [{}]}{prompt_end} '
-$PROMPT_FIELDS['prompt_end'] = lambda: '{INTENSE_RED}@#' if $USER == "root" else '{GREEN}@'
-def prompt():
-    p = ''
-    if $USER != "root" or $USER != "toor":
-        p = '{INTENSE_GREEN}{user}{WHITE}@{INTENSE_CYAN}{hostname}'
-    else:
-        p = '{INTENSE_RED}{hostname}'
-    p += '{WHITE}:{INTENSE_YELLOW}{cwd} {DEFAULT}{gitstatus: [{}]}{prompt_end} '
-    return p
-$PROMPT = prompt
diff --git a/vars/main.yaml b/vars/main.yaml
index 493a912..23a176a 100644
--- a/vars/main.yaml
+++ b/vars/main.yaml
@@ -54,6 +54,7 @@ debian_common_packages:
   - jo
   - pv
   - qrencode
+  - moreutils
 
   # languages
   - python3