6 files changed, 28 insertions, 3 deletions
diff --git a/krebs/0tests/data/test-config.nix b/krebs/0tests/data/test-config.nix
index f0927ddd9..33cb01245 100644
--- a/krebs/0tests/data/test-config.nix
+++ b/krebs/0tests/data/test-config.nix
@@ -8,7 +8,6 @@
   ];
 
   krebs.hosts.minimal = {
-    cores = 1;
     secure = false;
   };
 
diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix
index a802b8a25..5435ea166 100644
--- a/krebs/2configs/ircd.nix
+++ b/krebs/2configs/ircd.nix
@@ -8,6 +8,7 @@
   services.ergochat = {
     enable = true;
     settings = {
+      server.name = "irc.r";
       server.secure-nets = [
         "42::0/16"
         "10.240.0.0/12"
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 9bcee6fbd..11aaf876a 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -146,7 +146,7 @@ let
     command = 1;
     arguments = [2];
     env.TASKDATA = "${stateDir}/${name}";
-    commands = {
+    commands = rec {
       add.filename = pkgs.writeDash "${name}-task-add" ''
         ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} add "$1"
       '';
@@ -159,6 +159,7 @@ let
       delete.filename = pkgs.writeDash "${name}-task-delete" ''
         ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} delete "$1"
       '';
+      del = delete;
       done.filename = pkgs.writeDash "${name}-task-done" ''
         ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} done "$1"
       '';
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 6babac72e..bff7e135f 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -7,6 +7,7 @@ let
   out = {
     imports = [
       ../../kartei
+      ../../submodules/disko/module.nix
       ./acl.nix
       ./airdcpp.nix
       ./announce-activation.nix
diff --git a/krebs/5pkgs/simple/generate-secrets/default.nix b/krebs/5pkgs/simple/generate-secrets/default.nix
index f9a7450f7..a3c9f67c5 100644
--- a/krebs/5pkgs/simple/generate-secrets/default.nix
+++ b/krebs/5pkgs/simple/generate-secrets/default.nix
@@ -23,7 +23,6 @@ pkgs.writers.writeDashBin "generate-secrets" ''
 
   cat <<EOF
     $HOSTNAME = {
-      cores = 1;
       owner = config.krebs.users.krebs;
       nets = {
         retiolum = {
diff --git a/krebs/5pkgs/simple/git-assembler.nix b/krebs/5pkgs/simple/git-assembler.nix
new file mode 100644
index 000000000..095dddf0f
--- /dev/null
+++ b/krebs/5pkgs/simple/git-assembler.nix
@@ -0,0 +1,24 @@
+{ pkgs, stdenv }:
+
+stdenv.mkDerivation rec {
+  pname = "git-assembler";
+  version = "1.3";
+
+  src = pkgs.fetchFromGitLab {
+    owner = "wavexx";
+    repo = "git-assembler";
+    rev = "v${version}";
+    hash = "sha256-A+ygt6Fxiu6EkVoQU5L1rhxu2e1HU0nbqJFzLzXzHBo=";
+  };
+
+  buildInputs = [
+    pkgs.python3
+  ];
+
+  buildPhase = ":";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp git-assembler $out/bin
+  '';
+}