~

hive.nix

@@ -44,20 +44,16 @@ in
         system.build.anywhere = pkgs.writeShellApplication {
           name = "anywhere-deploy_${name}.sh";
           runtimeInputs = [ pkgs.nixos-anywhere ];
+          # --kexec ${nodes.kat-kexec.config.system.build.kexecTarball}/${nodes.kat-kexec.config.system.kexec-installer.name}-${pkgs.stdenv.hostPlatform.system}.tar.gz
           text = ''
-            nixos-anywhere --kexec ${nodes.kat-kexec.config.system.build.kexecTarball}/${nodes.kat-kexec.config.system.kexec-installer.name}-${pkgs.stdenv.hostPlatform.system}.tar.gz --store-paths ${config.system.build.diskoScriptNoDeps} ${config.system.build.toplevel} ${config.deployment.targetHost}
+            nixos-anywhere --store-paths ${config.system.build.diskoScriptNoDeps} ${config.system.build.toplevel} ${config.deployment.targetHost}
           '';
         };
       };
     };
 
   kat-probook =
-    {
+    { users, ... }:
-      name,
-      nodes,
-      users,
-      ...
-    }:
     {
       deployment.allowLocalDeployment = true;
 
@@ -73,7 +69,7 @@ in
     };
 
   kat-r86s =
-    { name, nodes, ... }:
+    { users, ... }:
     {
       deployment.targetHost = "r86s.kat";
       imports = [
@@ -82,10 +78,23 @@ in
       ];
     };
 
-  kat-virt =
+  kat-watcher =
-    { name, nodes, ... }:
+    { users, ... }:
     {
-      deployment.targetHost = "virt.kat";
+      deployment.targetHost = "watcher.kat";
+      imports = [
+        ./machines/kat-watcher
+        (users.root { ssh = true; })
+      ];
+    };
+
+  kat-virt =
+    { users, ... }:
+    {
+      deployment = {
+        targetHost = "virt.kat";
+        tags = [ "kat-vms" ];
+      };
 
       imports = [
         ./machines/kat-virt
@@ -95,9 +104,12 @@ in
     };
 
   kat-traque =
-    { name, nodes, ... }:
+    { users, ... }:
     {
-      deployment.targetHost = "traque.kat";
+      deployment = {
+        targetHost = "traque.kat";
+        tags = [ "kat-vms" ];
+      };
 
       imports = [
         ./machines/kat-traque
@@ -107,9 +119,12 @@ in
     };
 
   kat-mail-test =
-    { name, nodes, ... }:
+    { users, ... }:
     {
-      deployment.targetHost = "mail-test.kat";
+      deployment = {
+        targetHost = "mail-test.kat";
+        tags = [ "kat-vms" ];
+      };
 
       imports = [
         ./machines/kat-mail-test
@@ -118,20 +133,13 @@ in
       users.users.root.openssh.authorizedKeys.keys = [ id_sylvain ];
     };
 
-  kat-watcher =
-    { name, nodes, ... }:
-    {
-      deployment.targetHost = "watcher.kat";
-      imports = [
-        ./machines/kat-watcher
-        (users.root { ssh = true; })
-      ];
-    };
-
   kat-son =
-    { name, nodes, ... }:
+    { users, ... }:
     {
-      deployment.targetHost = "son.kat";
+      deployment = {
+        targetHost = "son.kat";
+        tags = [ "kat-vms" ];
+      };
       imports = [
         ./machines/kat-son
         (users.root { ssh = true; })
@@ -140,7 +148,7 @@ in
 
   kat-iso =
     {
-      name,
+      users,
       pkgs,
       modulesPath,
       ...
@@ -175,7 +183,7 @@ in
 
   kat-kexec =
     {
-      name,
+      users,
       pkgs,
       modulesPath,
       lib,

machines/kat-mail-test/default.nix

@@ -99,9 +99,7 @@ in
 
     loginAccounts = {
       "root@${host}" = {
-        catchAll = [
+        catchAll = [ host ];
-          host
-        ];
         aliases = builtins.genList (id: "user${toString id}@${host}") 10 ++ [ "moderators@${host}" ];
         hashedPassword = "$2b$05$FoCVDECXYG0KXPigPuIZtuNFiviwSg8RuXx0FbnzC7ZRp.Mz8VWOe";
       };

machines/kat-traque/default.nix

@@ -160,9 +160,7 @@ in
       serviceConfig = {
         WorkingDirectory = "/var/lib/traque";
         ExecStart = "${traque-pkg}/bin/traque";
-        ExecReload = [
+        ExecReload = [ "${pkgs.coreutils}/bin/kill -HUP $MAINPID" ];
-          "${pkgs.coreutils}/bin/kill -HUP $MAINPID"
-        ];
         User = "traque";
         Group = "traque";
         DynamicUser = true;

machines/kat-traque/traque-pkg.nix

@@ -1,6 +1,4 @@
-{ lib
+{ lib, rustPlatform }:
-, rustPlatform
-}:
 
 rustPlatform.buildRustPackage rec {
   pname = "traque";

machines/kat-watcher/default.nix

@@ -90,12 +90,15 @@
       }) vhosts;
       streamConfig =
         builtins.concatStringsSep "\n" (
-          lib.mapAttrsToList (vhost: sshport: lib.optionalString (!isNull sshport) ''
+          lib.mapAttrsToList (
+            vhost: sshport:
+            lib.optionalString (!isNull sshport) ''
               server {
                 listen ${toString sshport};
                 proxy_pass ${kat-r86s}:${toString sshport};
               }
-          '') vhosts
+            ''
+          ) vhosts
         )
         + ''
           server {