6 files changed, 34 insertions, 25 deletions
diff --git a/krebs/5pkgs/simple/Reaktor/plugins.nix b/krebs/5pkgs/simple/Reaktor/plugins.nix
index f3b771190..c39e39799 100644
--- a/krebs/5pkgs/simple/Reaktor/plugins.nix
+++ b/krebs/5pkgs/simple/Reaktor/plugins.nix
@@ -141,25 +141,27 @@ rec {
     '';
   });
 
-  wiki-todo-add = buildSimpleReaktorPlugin "wiki-todo-add" {
-    pattern = "^wiki-todo: (?P<args>.*)$$";
-    script = pkgs.writeDash "wiki-todo-add" ''
-      echo "$*" >> wiki-todo
-      echo "added todo. check on http://lassul.us/wiki-todo"
-    '';
-  };
-  wiki-todo-done = buildSimpleReaktorPlugin "wiki-todo-done" {
-    pattern = "^wiki-done: (?P<args>.*)$$";
-    script = pkgs.writeDash "wiki-todo-done" ''
-      ${pkgs.gnugrep}/bin/grep -Fvxe "$*" wiki-todo > wiki-todo.tmp
-      ${pkgs.coreutils}/bin/mv wiki-todo.tmp wiki-todo
-      echo "thank you for resolving todo: $*"
-    '';
-  };
-  wiki-todo-show = buildSimpleReaktorPlugin "wiki-todo" {
-    pattern = "^wiki-show$";
-    script = pkgs.writeDash "wiki-show" ''
-      ${pkgs.coreutils}/bin/cat wiki-todo
-    '';
+  todo = name: {
+    add = buildSimpleReaktorPlugin "${name}-add" {
+      pattern = "^${name}-add: (?P<args>.*)$$";
+      script = pkgs.writeDash "${name}-add" ''
+        echo "$*" >> ${name}-todo
+        echo "added ${name} todo"
+      '';
+    };
+    delete = buildSimpleReaktorPlugin "${name}-delete" {
+      pattern = "^${name}-delete: (?P<args>.*)$$";
+      script = pkgs.writeDash "${name}-delete" ''
+        ${pkgs.gnugrep}/bin/grep -Fvxe "$*" ${name}-todo > ${name}-todo.tmp
+        ${pkgs.coreutils}/bin/mv ${name}-todo.tmp ${name}-todo
+        echo "removed ${name} todo: $*"
+      '';
+    };
+    show = buildSimpleReaktorPlugin "${name}-show" {
+      pattern = "^${name}-show$";
+      script = pkgs.writeDash "${name}-show" ''
+        ${pkgs.coreutils}/bin/cat ${name}-todo
+      '';
+    };
   };
 }
diff --git a/krebs/5pkgs/simple/buildbot-classic/default.nix b/krebs/5pkgs/simple/buildbot-classic/default.nix
index 3cb691f53..e6bafbd25 100644
--- a/krebs/5pkgs/simple/buildbot-classic/default.nix
+++ b/krebs/5pkgs/simple/buildbot-classic/default.nix
@@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec {
   patches = [];
 
   src = fetchFromGitHub {
-    owner = "krebscode";
+    owner = "krebs";
     repo = "buildbot-classic";
     rev = version;
     sha256 = "0g686n6m0cjfyympl0ksansllx503gby3hx9gmc8hiyx6x5fkjha";
diff --git a/krebs/5pkgs/simple/painload/default.nix b/krebs/5pkgs/simple/painload/default.nix
index 136ec4394..3b1c83b42 100644
--- a/krebs/5pkgs/simple/painload/default.nix
+++ b/krebs/5pkgs/simple/painload/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, ... }:
 
 fetchgit {
-  url = https://github.com/krebscode/painload;
+  url = https://github.com/krebs/painload;
   rev = "c113487f73713a03b1a139b22bb34b86234d0495";
   sha256 = "1irxklnmvm8wsa70ypjahkr8rfqq7357vcy8r0x1sfncs1hy6gr6";
 }
diff --git a/krebs/5pkgs/simple/repo-sync/default.nix b/krebs/5pkgs/simple/repo-sync/default.nix
index 20326901d..8393cd79f 100644
--- a/krebs/5pkgs/simple/repo-sync/default.nix
+++ b/krebs/5pkgs/simple/repo-sync/default.nix
@@ -10,7 +10,7 @@ with python3Packages; buildPythonPackage rec {
     pkgs.git
   ];
   src = fetchFromGitHub {
-    owner = "krebscode";
+    owner = "krebs";
     repo = "repo-sync";
     rev = version;
     sha256 = "1qjf1jmxf7xzwskybdys4vqncnwj9f3xwk1gv354zrla68s533cw";
diff --git a/krebs/5pkgs/simple/retiolum-bootstrap/default.nix b/krebs/5pkgs/simple/retiolum-bootstrap/default.nix
index 331b1cb7f..c0651f627 100644
--- a/krebs/5pkgs/simple/retiolum-bootstrap/default.nix
+++ b/krebs/5pkgs/simple/retiolum-bootstrap/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
 
   src = fetchurl {
-    url = https://raw.githubusercontent.com/krebscode/painload/master/retiolum/scripts/tinc_setup/new_install.sh;
+    url = https://raw.githubusercontent.com/krebs/painload/master/retiolum/scripts/tinc_setup/new_install.sh;
     sha256 = "03kmil8q2xm3rdm2jxyah7vww84pw6w01d0c3siid9zpn2j7la9s";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Retiolum boostrap scripts";
-    url = https://github.com/krebscode/painload;
+    url = https://github.com/krebs/painload;
     license = licenses.wtfpl;
     platforms = platforms.unix;
     maintainers = with maintainers; [ makefu ];
diff --git a/krebs/5pkgs/simple/thesauron/default.nix b/krebs/5pkgs/simple/thesauron/default.nix
new file mode 100644
index 000000000..d543319f2
--- /dev/null
+++ b/krebs/5pkgs/simple/thesauron/default.nix
@@ -0,0 +1,7 @@
+{ fetchgit, callPackage }: let
+  src = fetchgit {
+    url = "https://github.com/krebs/thesauron";
+    rev = "8ac22588cf2c20465e3c9348e7ce04885599c2a5";
+    "sha256"= "1ivkjl235dnm5aaqqvarnxkz7zh0gvah22b0fqwlsflrcd5wmgva";
+  };
+in callPackage src {}