11 files changed, 188 insertions, 89 deletions
diff --git a/tv/5pkgs/override/flameshot/default.nix b/tv/5pkgs/override/flameshot/default.nix
new file mode 100644
index 000000000..2f7c5236b
--- /dev/null
+++ b/tv/5pkgs/override/flameshot/default.nix
@@ -0,0 +1,15 @@
+self: super:
+
+super.flameshot.overrideAttrs (old: rec {
+  name = "flameshot-${version}";
+  version = "0.10.2";
+  src = self.fetchFromGitHub {
+    owner = "flameshot-org";
+    repo = "flameshot";
+    rev = "v${version}";
+    sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4=";
+  };
+  patches = old.patches or [] ++ [
+    ./flameshot/flameshot_imgur_0.10.2.patch
+  ];
+})
diff --git a/tv/5pkgs/override/flameshot/flameshot_imgur_0.10.2.patch b/tv/5pkgs/override/flameshot/flameshot_imgur_0.10.2.patch
new file mode 100644
index 000000000..c4c0bf38a
--- /dev/null
+++ b/tv/5pkgs/override/flameshot/flameshot_imgur_0.10.2.patch
@@ -0,0 +1,35 @@
+--- a/src/tools/imgur/imguruploader.cpp
++++ b/src/tools/imgur/imguruploader.cpp
+@@ -31,6 +31,7 @@
+ #include <QTimer>
+ #include <QUrlQuery>
+ #include <QVBoxLayout>
++#include <stdlib.h>
+ 
+ ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent)
+   : QWidget(parent)
+@@ -79,8 +80,11 @@ void ImgurUploader::handleReply(QNetworkReply* reply)
+         m_imageURL.setUrl(data[QStringLiteral("link")].toString());
+ 
+         auto deleteToken = data[QStringLiteral("deletehash")].toString();
++        char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL");
++        if (deleteImageURLPattern == NULL)
++            deleteImageURLPattern = "https://imgur.com/delete/%1";
+         m_deleteImageURL.setUrl(
+-          QStringLiteral("https://imgur.com/delete/%1").arg(deleteToken));
++          QString::fromUtf8(deleteImageURLPattern).arg(deleteToken));
+ 
+         // save history
+         QString imageName = m_imageURL.toString();
+@@ -133,7 +137,10 @@ void ImgurUploader::upload()
+     QString description = FileNameHandler().parsedPattern();
+     urlQuery.addQueryItem(QStringLiteral("description"), description);
+ 
+-    QUrl url(QStringLiteral("https://api.imgur.com/3/image"));
++    char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL");
++    if (createImageURLPattern == NULL)
++        createImageURLPattern = "https://api.imgur.com/3/image";
++    QUrl url(QString::fromUtf8(createImageURLPattern));
+     url.setQuery(urlQuery);
+     QNetworkRequest request(url);
+     request.setHeader(QNetworkRequest::ContentTypeHeader,
diff --git a/tv/5pkgs/override/iosevka-tv-1.nix b/tv/5pkgs/override/iosevka-tv-1.nix
new file mode 100644
index 000000000..880160b3e
--- /dev/null
+++ b/tv/5pkgs/override/iosevka-tv-1.nix
@@ -0,0 +1,20 @@
+self: super:
+
+let
+  srcpkg = super.iosevka-tv-1;
+  binpkg = self.fetchzip {
+    inherit (srcpkg) pname version;
+    stripRoot = false;
+    hash = "sha256-QIuTS70vUQSvDDXjY4uI6SCcu1XT4HjvzpthvrNX4h0=";
+    urls = [
+      "https://c.krebsco.de/${srcpkg.name}.tar.gz"
+      "https://ni.krebsco.de/~tv/mirrors/iosevka/${srcpkg.name}.tar.gz"
+    ];
+  };
+in
+
+if srcpkg.version == binpkg.version then
+  binpkg
+
+else
+  srcpkg
diff --git a/tv/5pkgs/override/iosevka-tv-2.nix b/tv/5pkgs/override/iosevka-tv-2.nix
new file mode 100644
index 000000000..2eecf3cff
--- /dev/null
+++ b/tv/5pkgs/override/iosevka-tv-2.nix
@@ -0,0 +1,20 @@
+self: super:
+
+let
+  srcpkg = super.iosevka-tv-2;
+  binpkg = self.fetchzip {
+    inherit (srcpkg) pname version;
+    stripRoot = false;
+    hash = "sha256-PuIrW1ftYD5PW4du6gq1XpUM3v0potwmj+vAxJImF/A=";
+    urls = [
+      "https://c.krebsco.de/${srcpkg.name}.tar.gz"
+      "https://ni.krebsco.de/~tv/mirrors/iosevka/${srcpkg.name}.tar.gz"
+    ];
+  };
+in
+
+if srcpkg.version == binpkg.version then
+  binpkg
+
+else
+  srcpkg
diff --git a/tv/5pkgs/simple/alacritty-tv.nix b/tv/5pkgs/simple/alacritty-tv.nix
index 1c7730a71..ddf2ca8df 100644
--- a/tv/5pkgs/simple/alacritty-tv.nix
+++ b/tv/5pkgs/simple/alacritty-tv.nix
@@ -53,10 +53,10 @@ let
     window.dimensions.lines = 9;
   };
   variants.hidpi = {
-    font.normal.family = "iosevka-tv-1";
-    font.bold.family = "iosevka-tv-1";
-    font.italic.family = "iosevka-tv-1";
-    font.bold_italic.family = "iosevka-tv-1";
+    font.normal.family      = "iosevka tv 2 Light";
+    font.italic.family      = "iosevka tv 2 Light";
+    font.bold.family        = "iosevka tv 2 Medium";
+    font.bold_italic.family = "iosevka tv 2 Medium";
     font.size = 5;
     key_bindings = [
       { key = "Up";   mods = "Control";       action = "IncreaseFontSize"; }
@@ -104,7 +104,7 @@ let
     ref=$(! test -e "$HOME"/ref || ${pkgs.coreutils}/bin/cat "$HOME"/ref)
     if test "$ref" != ${config-file}; then
       echo ${config-file} > "$HOME"/ref
-      ${pkgs.coreutils}/bin/cp ${config-file} "$HOME"/.alacritty.yml
+      ${pkgs.coreutils}/bin/install -m 644 ${config-file} "$HOME"/.alacritty.yml
     fi
   '';
 in
diff --git a/tv/5pkgs/simple/ff.nix b/tv/5pkgs/simple/ff.nix
index 4ce9c3c75..b6022c6ca 100644
--- a/tv/5pkgs/simple/ff.nix
+++ b/tv/5pkgs/simple/ff.nix
@@ -1,5 +1,8 @@
 { pkgs }:
 
 pkgs.writeDashBin "ff" ''
+  case $TOUCHSCREEN in 1)
+    export MOZ_USE_XINPUT2=1
+  esac
   exec ${pkgs.firefox}/bin/firefox "$@"
 ''
diff --git a/tv/5pkgs/simple/alacritty-font-size.nix b/tv/5pkgs/simple/font-size-alacritty.nix
index 84bc3f616..d37f0f055 100644
--- a/tv/5pkgs/simple/alacritty-font-size.nix
+++ b/tv/5pkgs/simple/font-size-alacritty.nix
@@ -6,7 +6,7 @@ pkgs.writeDashBin "font-size-alacritty" ''
 
   set -efu
 
-  min_size=8
+  min_size=5
 
   op=''${1%%[0-9]*}
   op=''${op:-=}
diff --git a/tv/5pkgs/simple/iosevka-tv-1.nix b/tv/5pkgs/simple/iosevka-tv-1.nix
index f72565bc7..0f8b4d4b2 100644
--- a/tv/5pkgs/simple/iosevka-tv-1.nix
+++ b/tv/5pkgs/simple/iosevka-tv-1.nix
@@ -3,7 +3,7 @@
 pkgs.iosevka.override {
   # https://typeof.net/Iosevka/customizer
   privateBuildPlan = {
-    family = "iosevka-tv-1";
+    family = "iosevka tv 1";
     spacing = "term";
     serifs = "sans";
     export-glyph-names = true;
@@ -14,5 +14,5 @@ pkgs.iosevka.override {
     widths.normal.menu = 5;
     widths.normal.css = "normal";
   };
-  set = "iosevka-tv-1";
+  set = "tv-1";
 }
diff --git a/tv/5pkgs/simple/iosevka-tv-2.nix b/tv/5pkgs/simple/iosevka-tv-2.nix
new file mode 100644
index 000000000..888ba6a0c
--- /dev/null
+++ b/tv/5pkgs/simple/iosevka-tv-2.nix
@@ -0,0 +1,20 @@
+{ pkgs }:
+
+pkgs.iosevka.override {
+  # https://typeof.net/Iosevka/customizer
+  privateBuildPlan = {
+    family = "iosevka tv 2";
+    spacing = "term";
+    serifs = "sans";
+    export-glyph-names = true;
+    no-ligation = true;
+    no-cv-ss = false;
+
+    variants.inherits = "ss10";
+
+    widths.normal.shape = 600;
+    widths.normal.menu = 5;
+    widths.normal.css = "normal";
+  };
+  set = "tv-2";
+}
diff --git a/tv/5pkgs/simple/libinput-tv.nix b/tv/5pkgs/simple/libinput-tv.nix
new file mode 100644
index 000000000..6f08689bb
--- /dev/null
+++ b/tv/5pkgs/simple/libinput-tv.nix
@@ -0,0 +1,11 @@
+{ pkgs }:
+
+pkgs.libinput.overrideAttrs (old: {
+  patches = old.patches or [] ++ [
+    (pkgs.fetchurl {
+      name = "libinput-winmax2.patch";
+      url = "https://github.com/4z3/libinput/commit/2d0ff41.patch";
+      sha256 = "0ipsxzjf98g9w2m163gp49zl14wbxs84s0psdnvk7wfiivgcnm1f";
+    })
+  ];
+})
diff --git a/tv/5pkgs/simple/q/default.nix b/tv/5pkgs/simple/q/default.nix
index 2ae71db52..809e37e59 100644
--- a/tv/5pkgs/simple/q/default.nix
+++ b/tv/5pkgs/simple/q/default.nix
@@ -10,71 +10,44 @@ let
     hspace = 2;
 
     # Return number of columns required to print n calenders side by side.
-    need_width = n:
-      assert n >= 1;
-      n * calwidth + (n - 1) * hspace;
-
-    pad = /* sh */ ''{
-      ${pkgs.gnused}/bin/sed '
-            # rtrim
-            s/ *$//
-
-            # delete last empty line
-            ''${/^$/d}
-          ' \
-        | ${pkgs.gawk}/bin/awk '{printf "%-${toString calwidth}s\n", $0}' \
-        | ${pkgs.gnused}/bin/sed '
-              # colorize header
-              1,2s/.*/[38;5;238;1m&[39;22m/
-
-              # colorize week number
-              s/^[ 1-9][0-9]/[38;5;238;1m&[39;22m/
-            '
-    }'';
+    need_width = n: assert n >= 1; n * calwidth + (n - 1) * hspace;
+
   in /* sh */ ''
     cols=$(${pkgs.ncurses}/bin/tput cols)
-    ${pkgs.coreutils}/bin/paste \
-        <(if test $cols -ge ${toString (need_width 3)}; then
-          ${pkgs.utillinux}/bin/cal -mw \
-              $(${pkgs.coreutils}/bin/date +'%m %Y' -d 'last month') \
-            | ${pad}
-        fi) \
-        <(if test $cols -ge ${toString (need_width 1)}; then
-          ${pkgs.utillinux}/bin/cal -mw \
-            | ${pkgs.gnused}/bin/sed '
-                # colorize day of month
-                s/\(^\| \)'"$(${pkgs.coreutils}/bin/date +%e)"'\>/[31;1m&[39;22m/
-              ' \
-            | ${pad}
-        fi) \
-        <(if test $cols -ge ${toString (need_width 2)}; then
-          ${pkgs.utillinux}/bin/cal -mw \
-              $(${pkgs.coreutils}/bin/date +'%m %Y' -d 'next month') \
-            | ${pad}
-        fi) \
-      | ${pkgs.gnused}/bin/sed '
-          s/^\t//
-          s/\t$//
-          s/\t/${lpad hspace " " ""}/g
-        '
+    if test $cols -ge ${toString (need_width 3)}; then
+      ${pkgs.utillinux}/bin/cal --color=always -mw3
+    elif test $cols -ge ${toString (need_width 2)}; then
+      ${pkgs.utillinux}/bin/cal --color=always -mw -n 2
+    elif test $cols -ge ${toString (need_width 1)}; then
+      ${pkgs.utillinux}/bin/cal --color=always -mw1
+    else
+      :
+    fi |
+    ${pkgs.gnused}/bin/sed -r '
+      # dim week numbers
+      s/((^ *|  )[ 1-5][0-9](   *)?)(([ 1-3][0-9])*)/[38;5;243m\1[m\4/g
+      # dim month and day names
+      s/^ *[A-Z].*/[38;5;243m&[m/
+      # highlight current date
+      s/\[7m/[38;5;009;1m/
+      s/\[27m/[m/
+    '
   '';
 
-  q-isodate = /* sh */ ''
+  q-isodate = TZ: color: /* sh */ ''
+    TZ=${shell.escape TZ} \
     ${pkgs.coreutils}/bin/date \
-        '+[1m%Y-%m-%d[;30mT[;38;5;085m%H:%M[m:%S%:z'
+        '+[m%Y-%m-%d[38;5;243mT[;'${shell.escape color}'m%H:%M[38;5;243m:[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 \
-        '+[1m%Y-%m-%d[;30mT[;38;5;088m%H:%M[m:%S%:z'
-  '';
+  q-sgtdate = q-isodate "Asia/Singapore" "38;2;237;46;56";
 
-  q-utcdate = /* sh */ ''
-    ${pkgs.coreutils}/bin/date -u \
-        '+[1m%Y-%m-%d[;30mT[;38;5;065m%H:%M[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
@@ -106,31 +79,34 @@ let
     echo "VT: $(${pkgs.systemd}/bin/systemd-detect-virt)"
   '';
 
-  q-wireless = /* sh */ ''
+  q-net = /* sh */ ''
     for dev in $(
-      ${pkgs.iw}/bin/iw dev \
-        | ${pkgs.gnused}/bin/sed -n 's/^\s*Interface\s\+\([0-9a-z]\+\)$/\1/p'
+      ${pkgs.iproute}/bin/ip a |
+      ${pkgs.gnused}/bin/sed -rn 's/^[0-9]+: ([^:]+):.*/\1/p' |
+      ${pkgs.gnugrep}/bin/grep -Ev '^(lo|retiolum|wiregrill)$'
+      # TODO wiregrill ping ni.w, retiolum ping ni.r
     ); do
-      inet=$(${pkgs.iproute}/bin/ip addr show $dev \
-        | ${pkgs.gnused}/bin/sed -n '
-            s/.*inet \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p
-          ') \
-        || unset inet
-      ssid=$(${pkgs.iw}/bin/iw dev $dev link \
-        | ${pkgs.gnused}/bin/sed -n '
-            s/.*\tSSID: \(.*\)/\1/p
-          ') \
-        || unset ssid
-      echo "$dev''${inet+ $inet}''${ssid+ $ssid}"
+      {
+        inet=$(${pkgs.iproute}/bin/ip addr show $dev \
+          | ${pkgs.gnused}/bin/sed -n '
+              s/.*inet \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p
+            ')
+        ssid=$(${pkgs.iw}/bin/iw dev $dev link \
+          | ${pkgs.gnused}/bin/sed -n '
+              s/.*\tSSID: \(.*\)/\1/p
+            ')
+        latency=$(
+          /run/wrappers/bin/ping -W .25 -c 1 -I "$dev" ni.i 2>&1 |
+          ${pkgs.gnused}/bin/sed -rn '
+            s/.*time=([0-9.]+).*/online ni=[38;5;085m\1[m/p
+            s/.*Network is unreachable.*/offline/p
+            s/.*100% packet loss.*/offline/p
+          '
+        )
+        echo "$dev''${inet:+ $inet}''${ssid:+ $ssid} $latency"
+      } &
     done
-  '';
-
-  q-online = /* sh */ ''
-    if ${pkgs.curl}/bin/curl -s google.com >/dev/null; then
-      echo '[32;1monline[m'
-    else
-      echo offline
-    fi
+    wait
   '';
 
   q-thermal_zone = /* sh */ ''
@@ -173,14 +149,13 @@ pkgs.writeBashBin "q" ''
   export PATH=/var/empty
   ${q-cal}
   ${q-utcdate}
-  ${q-isodate}
+  ${q-deudate}
   ${q-sgtdate}
   (${q-gitdir}) &
   (${q-intel_backlight}) &
   ${pkgs.q-power_supply}/bin/q-power_supply &
   (${q-virtualization}) &
-  (${q-wireless}) &
-  (${q-online}) &
+  (${q-net}) &
   (${q-thermal_zone}) &
   wait
   if test "$PWD" != "$HOME" && test -e "$HOME/TODO"; then