From f4a094d5d431a6f852b71e1c13cb9d8f32fcd590 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 19 Sep 2017 23:18:58 +0200
Subject: tv wu: remove im config

---
 tv/1systems/wu/config.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tv/1systems/wu/config.nix b/tv/1systems/wu/config.nix
index 79b5aa26..5c593894 100644
--- a/tv/1systems/wu/config.nix
+++ b/tv/1systems/wu/config.nix
@@ -8,7 +8,6 @@ with import <stockholm/lib>;
     <stockholm/tv/2configs/hw/w110er.nix>
     <stockholm/tv/2configs/exim-retiolum.nix>
     <stockholm/tv/2configs/gitrepos.nix>
-    <stockholm/tv/2configs/im.nix>
     <stockholm/tv/2configs/mail-client.nix>
     <stockholm/tv/2configs/man.nix>
     <stockholm/tv/2configs/nginx/public_html.nix>
-- 
cgit v1.2.3


From a038ec100d480cb499366d64562369d3654895f7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 20 Sep 2017 00:47:37 +0200
Subject: tv diff-so-fancy: init at ed8cf17

Based on nixpkgs 28dd1158ff18def37892677a9eef109ce5147b81
---
 tv/5pkgs/default.nix              |  4 ++++
 tv/5pkgs/simple/diff-so-fancy.nix | 48 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 tv/5pkgs/simple/diff-so-fancy.nix

diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 8a7a613b..1796609a 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -24,6 +24,10 @@ foldl' mergeAttrs {}
         "$@"
   '';
 
+  gitAndTools = super.gitAndTools // {
+    inherit (self) diff-so-fancy;
+  };
+
   ff = self.writeDashBin "ff" ''
     exec ${self.firefoxWrapper}/bin/firefox "$@"
   '';
diff --git a/tv/5pkgs/simple/diff-so-fancy.nix b/tv/5pkgs/simple/diff-so-fancy.nix
new file mode 100644
index 00000000..9ce6d923
--- /dev/null
+++ b/tv/5pkgs/simple/diff-so-fancy.nix
@@ -0,0 +1,48 @@
+{stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}:
+
+stdenv.mkDerivation rec {
+  name = "diff-so-fancy-${version}";
+  version = "ed8cf17";
+
+  src = fetchFromGitHub {
+    owner = "so-fancy";
+    repo = "diff-so-fancy";
+    rev = "ed8cf1763d38bdd79ceb55a73b9ce7e30f1e184d";
+    sha256 = "176qn0w2rn6mr5ymvkblyiznqq7yyibfsnnjfivcyhz69w6yr9r9";
+  };
+
+  # Perl is needed here for patchShebangs
+  nativeBuildInputs = [ perl makeWrapper ];
+
+  buildPhase = null;
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib/diff-so-fancy
+
+    # diff-so-fancy executable searches for it's library relative to
+    # itself, so we are copying executable to lib, and only symlink it
+    # from bin/
+    cp diff-so-fancy $out/lib/diff-so-fancy
+    cp -r lib $out/lib/diff-so-fancy
+    ln -s $out/lib/diff-so-fancy/diff-so-fancy $out/bin
+
+    # ncurses is needed for `tput`
+    wrapProgram $out/lib/diff-so-fancy/diff-so-fancy \
+      --prefix PATH : "${git}/share/git/contrib/diff-highlight" \
+      --prefix PATH : "${git}/bin" \
+      --prefix PATH : "${coreutils}/bin" \
+      --prefix PATH : "${ncurses.out}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/so-fancy/diff-so-fancy;
+    description = "Good-looking diffs filter for git";
+    license = licenses.mit;
+    platforms = platforms.all;
+    longDescription = ''
+      diff-so-fancy builds on the good-lookin' output of git contrib's
+      diff-highlight to upgrade your diffs' appearances.
+    '';
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
-- 
cgit v1.2.3


From 778ce898a2cc97176d26d001687403d2f7660f2a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 20 Sep 2017 01:17:20 +0200
Subject: rsync-filter, gitignore: ignore TODO

---
 .gitignore    | 1 +
 .rsync-filter | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1ce08211..e1c6ef94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /.graveyard
+/TODO
diff --git a/.rsync-filter b/.rsync-filter
index 364a7986..67ec05fc 100644
--- a/.rsync-filter
+++ b/.rsync-filter
@@ -1,3 +1,4 @@
 - /.git
 - /.graveyard
+- /TODO
 P /.version-suffix
-- 
cgit v1.2.3


From 6fed88c5611f71726c82af93d0df0ac4112e9814 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 20 Sep 2017 11:58:04 +0200
Subject: tv q: print just no. of entries in ~ if PWD!=HOME

---
 tv/5pkgs/simple/q/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tv/5pkgs/simple/q/default.nix b/tv/5pkgs/simple/q/default.nix
index 2e7aa5cf..655c75e1 100644
--- a/tv/5pkgs/simple/q/default.nix
+++ b/tv/5pkgs/simple/q/default.nix
@@ -262,7 +262,7 @@ let
   '';
 
   q-todo = ''
-    TODO_file=$HOME/TODO
+    TODO_file=$PWD/TODO
     if test -e "$TODO_file"; then
       ${pkgs.coreutils}/bin/cat "$TODO_file" \
         | ${pkgs.gawk}/bin/gawk -v now=$(${pkgs.coreutils}/bin/date +%s) '
@@ -294,13 +294,7 @@ in
 pkgs.writeBashBin "q" ''
   set -eu
   export PATH=/var/empty
-  (${q-todo}) || :
-  if [ "$PWD" != "$HOME" ]; then
-    (HOME=$PWD; ${q-todo}) || :
-  fi
-  echo
   ${q-cal}
-  echo
   ${q-isodate}
   ${q-sgtdate}
   (${q-gitdir}) &
@@ -311,4 +305,14 @@ pkgs.writeBashBin "q" ''
   (${q-online}) &
   (${q-thermal_zone}) &
   wait
+  if test "$PWD" != "$HOME" && test -e "$HOME/TODO"; then
+    TODO_home_entries=$(cd; (${q-todo}) | ${pkgs.coreutils}/bin/wc -l)
+    if test "$TODO_home_entries" = 1; then
+      TODO_format='There is %d entry in ~/TODO'
+    else
+      TODO_format='There are %d entries in ~/TODO'
+    fi
+    printf "\x1b[38;5;238m$TODO_format\x1b[m\n" "$TODO_home_entries"
+  fi
+  (${q-todo}) || :
 ''
-- 
cgit v1.2.3