From a1d9c22bbd8eff9198f378e9007ddf4cb9ee2e5c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 10 Jan 2019 20:17:51 +0100
Subject: Reaktor plugins: merge task with todo, make task like todo

---
 krebs/2configs/reaktor-krebs.nix    | 6 +-----
 krebs/2configs/reaktor-retiolum.nix | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
index dc2838cae..862c9b991 100644
--- a/krebs/2configs/reaktor-krebs.nix
+++ b/krebs/2configs/reaktor-krebs.nix
@@ -14,12 +14,8 @@ with import <stockholm/lib>;
     };
     plugins = with pkgs.ReaktorPlugins; [
       sed-plugin
-      task-add
-      task-delete
-      task-done
-      task-list
     ] ++
-      (attrValues (todo "agenda"))
+      (attrValues (task "agenda"))
     ;
   };
   krebs.secret.files.nix-serve-key = {
diff --git a/krebs/2configs/reaktor-retiolum.nix b/krebs/2configs/reaktor-retiolum.nix
index 824f59d09..69fc4b202 100644
--- a/krebs/2configs/reaktor-retiolum.nix
+++ b/krebs/2configs/reaktor-retiolum.nix
@@ -10,12 +10,8 @@ with import <stockholm/lib>;
     };
     plugins = with pkgs.ReaktorPlugins; [
       sed-plugin
-      task-add
-      task-delete
-      task-done
-      task-list
     ] ++
-      (attrValues (todo "agenda"))
+      (attrValues (task "agenda"))
     ;
   };
 }
-- 
cgit v1.2.3


From 9082adf6878b5f917efc633cba63932d94942d13 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 21 Jan 2019 10:22:18 +0100
Subject: krebs: move exim aliases to dedicated file

---
 krebs/2configs/exim-smarthost.nix | 50 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 krebs/2configs/exim-smarthost.nix

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix
new file mode 100644
index 000000000..5dc24f1de
--- /dev/null
+++ b/krebs/2configs/exim-smarthost.nix
@@ -0,0 +1,50 @@
+with import <stockholm/lib>;
+{ config, ... }: let
+
+  format = from: to: {
+    inherit from;
+    # TODO assert is-retiolum-mail-address to;
+    to = concatMapStringsSep "," (getAttr "mail") (toList to);
+  };
+
+in {
+  krebs.exim-smarthost.internet-aliases =
+    mapAttrsToList format (with config.krebs.users; let
+      brain-ml = [
+        lass
+        makefu
+        tv
+      ];
+      eloop-ml = spam-ml ++ [ ciko ];
+      spam-ml = [
+        lass
+        makefu
+        tv
+      ];
+      ciko.mail = "ciko@slash16.net";
+    in {
+      "anmeldung@eloop.org" = eloop-ml;
+      "brain@krebsco.de" = brain-ml;
+      "cfp@eloop.org" = eloop-ml;
+      "kontakt@eloop.org" = eloop-ml;
+      "root@eloop.org" = eloop-ml;
+      "youtube@eloop.org" = eloop-ml;
+      "eloop2016@krebsco.de" = eloop-ml;
+      "eloop2017@krebsco.de" = eloop-ml;
+      "postmaster@krebsco.de" = spam-ml; # RFC 822
+      "lass@krebsco.de" = lass;
+      "makefu@krebsco.de" = makefu;
+      "spam@krebsco.de" = spam-ml;
+      "tv@krebsco.de" = tv;
+      # XXX These are no internet aliases
+      # XXX exim-retiolum hosts should be able to relay to retiolum addresses
+      "lass@retiolum" = lass;
+      "makefu@retiolum" = makefu;
+      "spam@retiolum" = spam-ml;
+      "tv@retiolum" = tv;
+      "lass@r" = lass;
+      "makefu@r" = makefu;
+      "spam@r" = spam-ml;
+      "tv@r" = tv;
+    });
+}
-- 
cgit v1.2.3


From 30bfcf1a10d8b490e23dd8a3a86cf205b4f2cdd5 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 22 Jan 2019 16:23:08 +0100
Subject: reaktor-krebs: join #nixos-de

---
 krebs/2configs/reaktor-krebs.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
index 862c9b991..67ca23ecd 100644
--- a/krebs/2configs/reaktor-krebs.nix
+++ b/krebs/2configs/reaktor-krebs.nix
@@ -7,6 +7,7 @@ with import <stockholm/lib>;
     channels = [
       "#krebs"
       "#nixos-wiki"
+      "#nixos-de"
     ];
     extraEnviron = {
       REAKTOR_HOST = "irc.freenode.org";
-- 
cgit v1.2.3


From 2263863845ce9636aa08d06eec15ae00b83139e7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 03:18:03 +0100
Subject: add nscd-fix

---
 krebs/2configs/nscd-fix.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 krebs/2configs/nscd-fix.nix

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/nscd-fix.nix b/krebs/2configs/nscd-fix.nix
new file mode 100644
index 000000000..20dc3bae4
--- /dev/null
+++ b/krebs/2configs/nscd-fix.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+with import <stockholm/lib>;
+let
+  versionOlderThan = v:
+    compareVersions
+      (versions.majorMinor version)
+      (versions.majorMinor v)
+      == -1;
+
+  enable =
+    versionOlderThan "19.03";
+    warning = ''
+      Using custom services.nscd.config because
+      https://github.com/NixOS/nixpkgs/pull/50316
+    '';
+in
+  optionalAttrs enable (trace warning {
+    services.nscd.enable = mkForce true;
+    services.nscd.config = mkForce (readFile (pkgs.fetchurl {
+      url = https://raw.githubusercontent.com/arianvp/nixpkgs/1d5f4cb/nixos/modules/services/system/nscd.conf;
+      sha256 = "1jlddk38lyynjn51zx3xi1nc29ahajyh0qg48qbq6dqlsrn3wxqs";
+    }));
+  })
+
-- 
cgit v1.2.3


From b28706964e78199859cbf6b78f869e9cc2f8a8ac Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 03:34:47 +0100
Subject: hotdog.r: Reaktor -> reaktor2

---
 krebs/2configs/reaktor-krebs.nix    |  27 ------
 krebs/2configs/reaktor-retiolum.nix |  17 ----
 krebs/2configs/reaktor2.nix         | 181 ++++++++++++++++++++++++++++++++++++
 3 files changed, 181 insertions(+), 44 deletions(-)
 delete mode 100644 krebs/2configs/reaktor-krebs.nix
 delete mode 100644 krebs/2configs/reaktor-retiolum.nix
 create mode 100644 krebs/2configs/reaktor2.nix

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
deleted file mode 100644
index 67ca23ecd..000000000
--- a/krebs/2configs/reaktor-krebs.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
-
-{
-  krebs.Reaktor.krebs = {
-    nickname = "Reaktor|krebs";
-    channels = [
-      "#krebs"
-      "#nixos-wiki"
-      "#nixos-de"
-    ];
-    extraEnviron = {
-      REAKTOR_HOST = "irc.freenode.org";
-      REAKTOR_NICKSERV_PASSWORD = "/var/lib/Reaktor/reaktor_nickserv_password";
-    };
-    plugins = with pkgs.ReaktorPlugins; [
-      sed-plugin
-    ] ++
-      (attrValues (task "agenda"))
-    ;
-  };
-  krebs.secret.files.nix-serve-key = {
-    path = "/var/lib/Reaktor/reaktor_nickserv_password";
-    owner.name = "Reaktor";
-    source-path = toString <secrets> + "/reaktor_nickserv_password";
-  };
-}
diff --git a/krebs/2configs/reaktor-retiolum.nix b/krebs/2configs/reaktor-retiolum.nix
deleted file mode 100644
index 69fc4b202..000000000
--- a/krebs/2configs/reaktor-retiolum.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
-
-{
-  krebs.Reaktor.retiolum = {
-    nickname = "Reaktor|lass";
-    channels = [ "#noise" "#xxx" ];
-    extraEnviron = {
-      REAKTOR_HOST = "irc.r";
-    };
-    plugins = with pkgs.ReaktorPlugins; [
-      sed-plugin
-    ] ++
-      (attrValues (task "agenda"))
-    ;
-  };
-}
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
new file mode 100644
index 000000000..95a95b8f5
--- /dev/null
+++ b/krebs/2configs/reaktor2.nix
@@ -0,0 +1,181 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }:
+
+let
+  stateDir = config.krebs.reaktor2.r.stateDir;
+
+  generators = pkgs.reaktor2-plugins.generators;
+  hooks = pkgs.reaktor2-plugins.hooks;
+  commands = pkgs.reaktor2-plugins.commands;
+
+  task = name: let
+    rcFile = builtins.toFile "taskrc" ''
+      confirmation=no
+    '';
+  in {
+    "${name}-task-add" = {
+      pattern = "^${name}-add: (.*)$";
+      activate = "match";
+      arguments = [1];
+      command = {
+        env = {
+          TASKDATA = "${stateDir}/${name}";
+        };
+        filename = pkgs.writeDash "${name}-task-add" ''
+          ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$*"
+        '';
+      };
+    };
+
+    "${name}-task-list" = {
+      pattern = "^${name}-list$";
+      activate = "match";
+      command = {
+        env = {
+          TASKDATA = "${stateDir}/${name}";
+        };
+        filename = pkgs.writeDash "${name}-task-list" ''
+          ${pkgs.taskwarrior}/bin/task rc:${rcFile} export | ${pkgs.jq}/bin/jq -r '.[] | select(.id != 0) | "\(.id) \(.description)"'
+        '';
+      };
+    };
+
+    "${name}-task-delete" = {
+      pattern = "^${name}-delete: (.*)$";
+      activate = "match";
+      arguments = [1];
+      command = {
+        env = {
+          TASKDATA = "${stateDir}/${name}";
+        };
+        filename = pkgs.writeDash "${name}-task-delete" ''
+          ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$*"
+        '';
+      };
+    };
+
+    "${name}-task-done" = {
+      pattern = "^${name}-done: (.*)$";
+      activate = "match";
+      arguments = [1];
+      command = {
+        env = {
+          TASKDATA = "${stateDir}/${name}";
+        };
+        filename = pkgs.writeDash "${name}-task-done" ''
+          ${pkgs.taskwarrior}/bin/task rc:${rcFile} done "$*"
+        '';
+      };
+    };
+  };
+
+  systemPlugin = {
+    plugin = "system";
+    config = {
+      workdir = stateDir;
+      hooks.JOIN = [
+        {
+          activate = "always";
+          command = {
+            filename =
+              "${pkgs.Reaktor.src}/reaktor/commands/tell-on_join";
+            env = {
+              PATH = makeBinPath [
+                pkgs.coreutils # XXX env, touch
+                pkgs.jq # XXX sed
+                pkgs.utillinux # XXX flock
+              ];
+              state_file = "${stateDir}/tell.json";
+            };
+          };
+        }
+      ];
+      hooks.PRIVMSG = [
+        {
+          pattern = "^ledger balance";
+          activate = "match";
+          command = {
+            env = {
+              state_file = "${stateDir}/ledger";
+            };
+            filename = pkgs.writeDash "ledger-balance" ''
+              ${pkgs.hledger}/bin/hledger -f $state_file bal -N
+            '';
+          };
+        }
+        {
+          pattern = ''^(\S+)\s+([+-][1-9][0-9]*)\s+(\S+)$'';
+          activate = "match";
+          arguments = [1 2 3];
+          command = {
+            env = {
+              # TODO; get state as argument
+              state_file = "${stateDir}/ledger";
+            };
+            filename = pkgs.writeDash "ledger-add" ''
+              set -x
+              tonick=$1
+              amt=$2
+              unit=$3
+              printf '%s\n  %s  %d %s\n  %s  %d %s\n' "$(date -Id)" "$tonick" "$amt" "$unit" "$_from" "$(expr 0 - "''${amt#+}")" "$unit" >> $state_file
+            '';
+          };
+        }
+        hooks.sed
+        (generators.command_hook {
+          inherit (commands) hello random-emoji nixos-version stockholm-issue;
+          tell = {
+            filename =
+              "${pkgs.Reaktor.src}/reaktor/commands/tell-on_privmsg";
+            env = {
+              PATH = makeBinPath [
+                pkgs.coreutils # XXX date, env
+                pkgs.jq # XXX sed
+                pkgs.utillinux # XXX flock
+              ];
+              state_file = "${stateDir}/tell.txt";
+            };
+          };
+        })
+      ] ++ (attrValues (task "agenda"))
+      ;
+    };
+  };
+
+in {
+
+  krebs.reaktor2 = {
+    freenode = {
+      hostname = "irc.freenode.org";
+      nick = "reaktor2|krebs";
+      plugins = [
+        {
+          plugin = "register";
+          config = {
+            channels = [
+              "#krebs"
+            ];
+          };
+        }
+        systemPlugin
+      ];
+      user = "reaktor2";
+    };
+    r = {
+      nick = "reaktor2|krebs";
+      plugins = [
+        {
+          plugin = "register";
+          config = {
+            channels = [
+              "#noise"
+              "#xxx"
+            ];
+          };
+        }
+        systemPlugin
+      ];
+      user = "reaktor2";
+    };
+  };
+}
-- 
cgit v1.2.3


From 052cef71fd24ce36bbd043e2aa12d2ff3a9d247c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 13:50:31 +0100
Subject: reaktor: ledger balance -> bier balance

---
 krebs/2configs/reaktor2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 95a95b8f5..ae2e975a2 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -92,13 +92,13 @@ let
       ];
       hooks.PRIVMSG = [
         {
-          pattern = "^ledger balance";
+          pattern = "^bier balance";
           activate = "match";
           command = {
             env = {
               state_file = "${stateDir}/ledger";
             };
-            filename = pkgs.writeDash "ledger-balance" ''
+            filename = pkgs.writeDash "bier-balance" ''
               ${pkgs.hledger}/bin/hledger -f $state_file bal -N
             '';
           };
-- 
cgit v1.2.3


From fd4876da16d436a38700b358f26ba48903de8d20 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 14:27:54 +0100
Subject: reaktor2: pretty print bier balance

---
 krebs/2configs/reaktor2.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index ae2e975a2..bdd95a256 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -99,7 +99,9 @@ let
               state_file = "${stateDir}/ledger";
             };
             filename = pkgs.writeDash "bier-balance" ''
-              ${pkgs.hledger}/bin/hledger -f $state_file bal -N
+              ${pkgs.hledger}/bin/hledger -f $state_file bal -N -O csv \
+                | ${pkgs.coreutils}/bin/tail +2 \
+                | ${pkgs.miller}/bin/mlr --icsv --opprint cat
             '';
           };
         }
-- 
cgit v1.2.3


From 92caf2dadae82310fe13830dfaac30fe885fbf3e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 14:32:33 +0100
Subject: reaktor2 bier: allow 'bier bal' as command

---
 krebs/2configs/reaktor2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index bdd95a256..9ca60b5bf 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -92,7 +92,7 @@ let
       ];
       hooks.PRIVMSG = [
         {
-          pattern = "^bier balance";
+          pattern = "^bier bal(ance)*$";
           activate = "match";
           command = {
             env = {
-- 
cgit v1.2.3


From 5926a718593544c69301f4168d30051ff1d61aab Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 27 Jan 2019 16:55:47 +0100
Subject: reaktor2 task: use single hook for more efficency

---
 krebs/2configs/reaktor2.nix | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 9ca60b5bf..f1e59142e 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -2,6 +2,7 @@ with import <stockholm/lib>;
 { config, pkgs, ... }:
 
 let
+  #for shared state directory
   stateDir = config.krebs.reaktor2.r.stateDir;
 
   generators = pkgs.reaktor2-plugins.generators;
@@ -13,11 +14,12 @@ let
       confirmation=no
     '';
   in {
-    "${name}-task-add" = {
-      pattern = "^${name}-add: (.*)$";
-      activate = "match";
-      arguments = [1];
-      command = {
+    pattern = "^${name}-([a-z]+)(?::\\s*(.*))?";
+    activate = "match";
+    command = 1;
+    arguments = [2];
+    commands = {
+      add = {
         env = {
           TASKDATA = "${stateDir}/${name}";
         };
@@ -25,12 +27,7 @@ let
           ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$*"
         '';
       };
-    };
-
-    "${name}-task-list" = {
-      pattern = "^${name}-list$";
-      activate = "match";
-      command = {
+      list = {
         env = {
           TASKDATA = "${stateDir}/${name}";
         };
@@ -38,13 +35,7 @@ let
           ${pkgs.taskwarrior}/bin/task rc:${rcFile} export | ${pkgs.jq}/bin/jq -r '.[] | select(.id != 0) | "\(.id) \(.description)"'
         '';
       };
-    };
-
-    "${name}-task-delete" = {
-      pattern = "^${name}-delete: (.*)$";
-      activate = "match";
-      arguments = [1];
-      command = {
+      delete = {
         env = {
           TASKDATA = "${stateDir}/${name}";
         };
@@ -52,13 +43,7 @@ let
           ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$*"
         '';
       };
-    };
-
-    "${name}-task-done" = {
-      pattern = "^${name}-done: (.*)$";
-      activate = "match";
-      arguments = [1];
-      command = {
+      done = {
         env = {
           TASKDATA = "${stateDir}/${name}";
         };
@@ -139,8 +124,8 @@ let
             };
           };
         })
-      ] ++ (attrValues (task "agenda"))
-      ;
+        (task "agenda")
+      ];
     };
   };
 
-- 
cgit v1.2.3


From 52ef20148e44f2b2017a0edc30899860799ad652 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 20:06:06 +0100
Subject: reaktor2 service: user -> username + proper type

---
 krebs/2configs/reaktor2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index f1e59142e..2beb6561b 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -146,7 +146,7 @@ in {
         }
         systemPlugin
       ];
-      user = "reaktor2";
+      username = "reaktor2";
     };
     r = {
       nick = "reaktor2|krebs";
@@ -162,7 +162,7 @@ in {
         }
         systemPlugin
       ];
-      user = "reaktor2";
+      username = "reaktor2";
     };
   };
 }
-- 
cgit v1.2.3


From b4f24ff76ad708343b67afce45765a66c6bfb660 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 20:09:11 +0100
Subject: krebs nscd-fix: normalize style

---
 krebs/2configs/nscd-fix.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/nscd-fix.nix b/krebs/2configs/nscd-fix.nix
index 20dc3bae4..8e5909e72 100644
--- a/krebs/2configs/nscd-fix.nix
+++ b/krebs/2configs/nscd-fix.nix
@@ -1,18 +1,19 @@
-{ pkgs, ... }:
 with import <stockholm/lib>;
-let
+{ pkgs, ... }: let
+
+  enable = versionOlderThan "19.03";
+
   versionOlderThan = v:
     compareVersions
       (versions.majorMinor version)
       (versions.majorMinor v)
       == -1;
 
-  enable =
-    versionOlderThan "19.03";
-    warning = ''
-      Using custom services.nscd.config because
-      https://github.com/NixOS/nixpkgs/pull/50316
-    '';
+  warning = ''
+    Using custom services.nscd.config because
+    https://github.com/NixOS/nixpkgs/pull/50316
+  '';
+
 in
   optionalAttrs enable (trace warning {
     services.nscd.enable = mkForce true;
@@ -21,4 +22,3 @@ in
       sha256 = "1jlddk38lyynjn51zx3xi1nc29ahajyh0qg48qbq6dqlsrn3wxqs";
     }));
   })
-
-- 
cgit v1.2.3


From 06b23af29d434f448faebf822d5f1f1e8a0c0a39 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 27 Jan 2019 20:32:04 +0100
Subject: reaktor2 task: define env in hook

---
 krebs/2configs/reaktor2.nix | 48 +++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 2beb6561b..ff6b539ba 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -18,39 +18,23 @@ let
     activate = "match";
     command = 1;
     arguments = [2];
+    env.TASKDATA = "${stateDir}/${name}";
     commands = {
-      add = {
-        env = {
-          TASKDATA = "${stateDir}/${name}";
-        };
-        filename = pkgs.writeDash "${name}-task-add" ''
-          ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$*"
-        '';
-      };
-      list = {
-        env = {
-          TASKDATA = "${stateDir}/${name}";
-        };
-        filename = pkgs.writeDash "${name}-task-list" ''
-          ${pkgs.taskwarrior}/bin/task rc:${rcFile} export | ${pkgs.jq}/bin/jq -r '.[] | select(.id != 0) | "\(.id) \(.description)"'
-        '';
-      };
-      delete = {
-        env = {
-          TASKDATA = "${stateDir}/${name}";
-        };
-        filename = pkgs.writeDash "${name}-task-delete" ''
-          ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$*"
-        '';
-      };
-      done = {
-        env = {
-          TASKDATA = "${stateDir}/${name}";
-        };
-        filename = pkgs.writeDash "${name}-task-done" ''
-          ${pkgs.taskwarrior}/bin/task rc:${rcFile} done "$*"
-        '';
-      };
+      add.filename = pkgs.writeDash "${name}-task-add" ''
+        ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$1"
+      '';
+      list.filename = pkgs.writeDash "${name}-task-list" ''
+        ${pkgs.taskwarrior}/bin/task rc:${rcFile} export \
+          | ${pkgs.jq}/bin/jq -r '
+              .[] | select(.id != 0) | "\(.id) \(.description)"
+            '
+      '';
+      delete.filename = pkgs.writeDash "${name}-task-delete" ''
+        ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$1"
+      '';
+      done.filename = pkgs.writeDash "${name}-task-done" ''
+        ${pkgs.taskwarrior}/bin/task rc:${rcFile} done "$1"
+      '';
     };
   };
 
-- 
cgit v1.2.3


From 0ead7ae0a71247581eb968c701e02af782424cd0 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 28 Jan 2019 08:29:19 +0100
Subject: k shack/ympd: add next and prev buttons at top

---
 krebs/2configs/shack/mobile.mpd.nix      |  5 ++++-
 krebs/2configs/shack/ympd-top-next.patch | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 krebs/2configs/shack/ympd-top-next.patch

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/shack/mobile.mpd.nix b/krebs/2configs/shack/mobile.mpd.nix
index 2dc466edb..751d233ec 100644
--- a/krebs/2configs/shack/mobile.mpd.nix
+++ b/krebs/2configs/shack/mobile.mpd.nix
@@ -1,5 +1,8 @@
 {lib,pkgs, ... }:
 let
+  pkg = lib.overrideDerivation pkgs.ympd (old: {
+      patches = [ ./ympd-top-next.patch ];
+  });
   mpdHost = "mpd.shack";
   ympd = name: port: let
     webPort = 10000 + port;
@@ -7,7 +10,7 @@ let
     systemd.services."ympd-${name}" = {
       description = "mpd for ${name}";
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${mpdHost} --port ${toString port} --webport ${toString webPort} --user nobody";
+      serviceConfig.ExecStart = "${pkg}/bin/ympd --host ${mpdHost} --port ${toString port} --webport ${toString webPort} --user nobody";
     };
     services.nginx.virtualHosts."mobile.${name}.mpd.shack" = {
       serverAliases = [
diff --git a/krebs/2configs/shack/ympd-top-next.patch b/krebs/2configs/shack/ympd-top-next.patch
new file mode 100644
index 000000000..fd424f11a
--- /dev/null
+++ b/krebs/2configs/shack/ympd-top-next.patch
@@ -0,0 +1,16 @@
+diff --git a/htdocs/index.html b/htdocs/index.html
+index ed77279..eaf92b6 100644
+--- a/htdocs/index.html
++++ b/htdocs/index.html
+@@ -76,6 +76,11 @@
+ 
+       <div class="col-md-10 col-xs-12">
+         <div class="notifications top-right"></div>
++
++        <ul class="pager">
++          <li id="prev" class="page-btn hide"><a href="">Previous</a></li>
++          <li id="next" class="page-btn"><a href="">Next</a></li>
++        </ul>
+         
+         <div class="panel panel-primary">
+           <!-- Default panel contents -->
-- 
cgit v1.2.3