summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-01-27 16:55:47 +0100
committerlassulus <lassulus@lassul.us>2019-01-27 16:55:47 +0100
commit5926a718593544c69301f4168d30051ff1d61aab (patch)
tree82ecfc932b93b353d8a940c059a382f86c2d850e
parent35a2ace1ae837cbfd957abfb45b62ef7be7651d6 (diff)
reaktor2 task: use single hook for more efficency
-rw-r--r--krebs/2configs/reaktor2.nix39
1 files changed, 12 insertions, 27 deletions
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")
+ ];
};
};