Merge remote-tracking branch 'upstream/workorch-zos' into workorch-zos

holochain · Apr 9, 2024 · ce5cb20 · ce5cb20
2 parents 5d2e09f + ea30924
commit ce5cb20
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/modules/flake-parts/nixosConfigurations.tfgrid-base/configuration.nix b/modules/flake-parts/nixosConfigurations.tfgrid-base/configuration.nix
@@ -3,6 +3,7 @@
   inputs,
   self,
   pkgs,
+  lib,
   ...
 }: let
   hostName = "tfgrid-base";
@@ -18,9 +19,8 @@ in {
     self.nixosModules.zosVmDir
   ];
 
-  networking.hostName = hostName;
-
-  nix.settings.max-jobs = 8;
+  # srvos' server module sets this with lib.mkDefault (1000) so go slightly higher in priority (lower in number)
+  networking.hostName = lib.mkOverride 999 hostName;
 
   nix.settings.substituters = [
     "https://holochain-ci.cachix.org"

diff --git a/modules/flake-parts/nixosConfigurations.tfgrid-devnet-vm0/configuration.nix b/modules/flake-parts/nixosConfigurations.tfgrid-devnet-vm0/configuration.nix
@@ -8,13 +8,17 @@
   hostName = "tfgrid-devnet-vm0";
 in {
   imports = [
-    ../../nixosConfigurations.tfgrid-base/configuration.nix
+    ../nixosConfigurations.tfgrid-base/configuration.nix
 
     inputs.sops-nix.nixosModules.sops
 
     self.nixosModules.nomad-client
   ];
 
+  nix.settings.max-jobs = 8;
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
   environment.systemPackages = [
     pkgs.iperf3
     pkgs.man

diff --git a/modules/flake-parts/tfgrid-microvm/default.nix b/modules/flake-parts/tfgrid-microvm/default.nix
@@ -42,9 +42,6 @@
       boot.initrd.systemd.enable = false;
 
       boot.loader.external.enable = true;
-
-      boot.kernelPackages = pkgs.linuxPackages_latest;
-
       # the first argument points to the new system's toplevel, which is equivalent to config.system.build.toplevel
       boot.loader.external.installHook = pkgs.writeShellScript "noop" ''
         ${pkgs.coreutils}/bin/ln -sf "$1"/init /init