tv q: streamline dates and use RGB

1 files changed, 10 insertions, 12 deletions

diff --git a/tv/5pkgs/simple/q/default.nix b/tv/5pkgs/simple/q/default.nix
index eb8462d5..a7a149dd 100644
--- a/tv/5pkgs/simple/q/default.nix
+++ b/tv/5pkgs/simple/q/default.nix
@@ -34,22 +34,20 @@ let
     '
   '';
 
-  q-isodate = /* sh */ ''
+  q-isodate = TZ: color: /* sh */ ''
+    TZ=${shell.escape TZ} \
     ${pkgs.coreutils}/bin/date \
-        '+%Y-%m-%dT%H:%M:%S%:z'
+        '+%Y-%m-%dT[;'${shell.escape color}'m%H:%M:%S%:z'
   '';
 
+  q-deudate = q-isodate "Europe/Berlin" "38;5;085";
+
   # Singapore's red is #ED2E38
-  q-sgtdate = /* sh */ ''
-    TZ=Asia/Singapore \
-    ${pkgs.coreutils}/bin/date \
-        '+%Y-%m-%dT%H:%M:%S%:z'
-  '';
+  q-sgtdate = q-isodate "Asia/Singapore" "38;2;237;46;56";
 
-  q-utcdate = /* sh */ ''
-    ${pkgs.coreutils}/bin/date -u \
-        '+%Y-%m-%dT%H:%M:%S%:z'
-  '';
+  q-thadate = q-isodate "Asia/Bangkok" "38;5;226";
+
+  q-utcdate = q-isodate "UTC" "38;5;065";
 
   q-gitdir = /* sh */ ''
     if test -d .git; then
@@ -148,7 +146,7 @@ pkgs.writeBashBin "q" ''
   export PATH=/var/empty
   ${q-cal}
   ${q-utcdate}
-  ${q-isodate}
+  ${q-deudate}
   ${q-sgtdate}
   (${q-gitdir}) &
   (${q-intel_backlight}) &