//hive/darwinConfigurations/darwin-test: init

Also some code splitting of hosts.test.meta
Lehmanator · May 24, 2024 · fcda468 · fcda468
1 parent 8f64d5f
commit fcda468
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 126 deletions.
diff --git a/flake.nix b/flake.nix
@@ -42,93 +42,92 @@
         inputs = i.all;
         inherit systems;
         cellsFrom = std.incl ./nix cells;
-        cellBlocks = with std.blockTypes;
-          [
-            #(inputs.std.blockTypes.functions "blockTypes")
-            # --- omnibus unused pops ---
-            #  allData, darwinModules, darwinProfiles, devshellModules,
-            #  example, flake, flake-parts, hive, load, microvms,
-            #  overlays, self, srvos, std, systemManagerProfiles
-            # --- flake.outputs ---
-            # checks, hydraJobs, nixConfig, templates
-            (functions "lib")
-            (functions "overlays")
-            (files "templates")
-            (installables "packages" { ci.build = true; })
-
-            # --- std missing blockTypes ---
-            (arion "arion")
-            (files "files")
-            (kubectl "kubectl")
-            (microvms "microvms")
-            (namaka "namaka")
-            (nixostests "nixosTests")
-            (nomad "nomad")
-            (nvfetcher "nvfetcher")
-            (pkgs "pkgs")
-            (terra "terra" "[email protected]:Lehmanator/nix-configs.git")
-
-            # --- config types ---
-            inputs.hive.blockTypes.colmenaConfigurations
-
-            (functions "devshellModules")
-            (functions "devshellProfiles")
-            (functions "devshellSuites")
-
-            inputs.hive.blockTypes.diskoConfigurations
-            (functions "diskoProfiles")
-            (functions "diskoSuites")
-
-            (functions "flakeModules")
-            (functions "flakeProfiles")
-            (functions "flakeSuites")
-
-            (functions "hardwareConfigurations")
-            (functions "hardwareModules")
-            (functions "hardwareProfiles")
-            (functions "hardwareSuites")
-
-            inputs.hive.blockTypes.homeConfigurations
-            (functions "homeModules")
-            (functions "homeProfiles")
-            (functions "homeSuites")
-            (functions "userProfiles")
-
-            inputs.hive.blockTypes.nixosConfigurations
-            (functions "nixosModules")
-            (functions "nixosProfiles")
-            (functions "nixosSuites")
-
-            (functions "robotnixConfigurations")
-            (functions "robotnixModules")
-            (functions "robotnixProfiles")
-            (functions "robotnixSuites")
-
-            (functions "systemManagerConfigurations")
-            (functions "systemManagerModules")
-            (functions "systemManagerProfiles")
-            (functions "systemManagerSuites")
-
-            (functions "termuxConfigurations")
-            (functions "termuxModules")
-            (functions "termuxProfiles")
-            (functions "termuxSuites")
-
-            (functions "vimConfigurations")
-            (functions "vimModules")
-            (functions "vimProfiles")
-            (functions "vimSuites")
-
-            (functions "wslConfigurations")
-            (functions "wslModules")
-            (functions "wslProfiles")
-            (functions "wslSuites")
-          ] ++ l.optionals (builtins.elem "aarch64-darwin" systems) [
-            inputs.hive.blockTypes.darwinConfigurations
-            (std.blockTypes.functions "darwinModules")
-            (std.blockTypes.functions "darwinProfiles")
-            (std.blockTypes.functions "darwinSuites")
-          ];
+        cellBlocks = with std.blockTypes; [
+          #(inputs.std.blockTypes.functions "blockTypes")
+          # --- omnibus unused pops ---
+          #  allData, darwinModules, darwinProfiles, devshellModules,
+          #  example, flake, flake-parts, hive, load, microvms,
+          #  overlays, self, srvos, std, systemManagerProfiles
+          # --- flake.outputs ---
+          # checks, hydraJobs, nixConfig, templates
+          (functions "lib")
+          (functions "overlays")
+          (files "templates")
+          (installables "packages" { ci.build = true; })
+
+          # --- std missing blockTypes ---
+          (arion "arion")
+          (files "files")
+          (kubectl "kubectl")
+          (microvms "microvms")
+          (namaka "namaka")
+          (nixostests "nixosTests")
+          (nomad "nomad")
+          (nvfetcher "nvfetcher")
+          (pkgs "pkgs")
+          (terra "terra" "[email protected]:Lehmanator/nix-configs.git")
+
+          # --- config types ---
+          inputs.hive.blockTypes.colmenaConfigurations
+
+          (functions "devshellModules")
+          (functions "devshellProfiles")
+          (functions "devshellSuites")
+
+          inputs.hive.blockTypes.diskoConfigurations
+          (functions "diskoProfiles")
+          (functions "diskoSuites")
+
+          (functions "flakeModules")
+          (functions "flakeProfiles")
+          (functions "flakeSuites")
+
+          (functions "hardwareConfigurations")
+          (functions "hardwareModules")
+          (functions "hardwareProfiles")
+          (functions "hardwareSuites")
+
+          inputs.hive.blockTypes.homeConfigurations
+          (functions "homeModules")
+          (functions "homeProfiles")
+          (functions "homeSuites")
+          (functions "userProfiles")
+
+          inputs.hive.blockTypes.nixosConfigurations
+          (functions "nixosModules")
+          (functions "nixosProfiles")
+          (functions "nixosSuites")
+
+          (functions "robotnixConfigurations")
+          (functions "robotnixModules")
+          (functions "robotnixProfiles")
+          (functions "robotnixSuites")
+
+          (functions "systemManagerConfigurations")
+          (functions "systemManagerModules")
+          (functions "systemManagerProfiles")
+          (functions "systemManagerSuites")
+
+          (functions "termuxConfigurations")
+          (functions "termuxModules")
+          (functions "termuxProfiles")
+          (functions "termuxSuites")
+
+          (functions "vimConfigurations")
+          (functions "vimModules")
+          (functions "vimProfiles")
+          (functions "vimSuites")
+
+          (functions "wslConfigurations")
+          (functions "wslModules")
+          (functions "wslProfiles")
+          (functions "wslSuites")
+          #] ++ l.optionals (builtins.elem "aarch64-darwin" systems) [
+          inputs.hive.blockTypes.darwinConfigurations
+          (std.blockTypes.functions "darwinModules")
+          (std.blockTypes.functions "darwinProfiles")
+          (std.blockTypes.functions "darwinSuites")
+        ];
         nixpkgsConfig = {
           allowUnfree = true;
           allowUnsupportedSystem = false;

diff --git a/nix/hive/hosts/darwin-test/homeConfiguration.nix b/nix/hive/hosts/darwin-test/homeConfiguration.nix
@@ -0,0 +1,8 @@
+{ inputs, cell, super, }: {
+  inherit (super.meta.darwinConfiguration) bee;
+  home = rec {
+    stateVersion = "24.05";
+    username = "sam";
+    homeDirectory = "/home/${username}";
+  };
+}
diff --git a/nix/hive/hosts/darwin-test/meta.nix b/nix/hive/hosts/darwin-test/meta.nix
@@ -0,0 +1,35 @@
+{ self, inputs, cell, ... }@args:
+#builtins.trace ([ "TEST-META" ] ++ (builtins.attrNames args))
+{
+  myargs = args;
+  system = "aarch64-darwin";
+  specialArgs = { user = "sam"; };
+  colmena = {
+    nixpkgs = { system = "aarch64-darwin"; }; # Is this `nixpkgs.config`?
+  };
+  colmenaConfiguration = {
+    inherit (self.nixosConfiguration) bee imports;
+    deployment = {
+      allowLocalDeployment = true;
+      tags = [ "test" ];
+    };
+  };
+  darwinConfiguration = {
+    system.stateVersion = 4;
+    bee = {
+      system = "aarch64-darwin";
+      inherit (inputs) wsl;
+      inherit (inputs.omnibus.flake.inputs) darwin;
+      home = inputs.home-manager;
+      pkgs = cell.pkgs.unstable-with-overlays;
+    };
+    homebrew = {
+      enable = true;
+      onActivation = {
+        autoUpdate = true;
+        upgrade = true;
+      };
+    };
+    imports = [{ _module.args = self.specialArgs; }];
+  };
+}
diff --git a/nix/hive/hosts/minimal/meta.nix b/nix/hive/hosts/minimal/meta.nix
@@ -69,11 +69,14 @@ in
       #cell.nixosProfiles.test
       cell.nixosProfiles.user-primary
 
-      cell.diskoConfigurations.wyse
+      cell.diskoConfigurations.test
     ];
-    xdg.portal = { enable = true; extraPortals=[bee.pkgs.xdg-desktop-portal-gtk]; };
+    xdg.portal = {
+      enable = true;
+      extraPortals = [ bee.pkgs.xdg-desktop-portal-gtk ];
+      configPackages = [ bee.pkgs.gnome.gnome-session ];
+    };
     #networking.hostName = "minimal";
     #home-manager.users.sam = ./users/sam;
-
   };
 }
diff --git a/nix/hive/hosts/test/darwinConfiguration.nix b/nix/hive/hosts/test/darwinConfiguration.nix
@@ -0,0 +1,11 @@
+{ super, inputs, cell, ... }@args: {
+  inherit (super.meta.nixosConfiguration) bee; # imports;
+  imports = [ ];
+  homebrew = {
+    enable = true;
+    onActivation = {
+      autoUpdate = true;
+      upgrade = true;
+    };
+  };
+}
diff --git a/nix/hive/hosts/test/homeConfiguration.nix b/nix/hive/hosts/test/homeConfiguration.nix
@@ -1,4 +1,4 @@
-{ inputs, cell, self, ... }@args:
+{ inputs, cell, super, ... }@args:
 #builtins.trace ([ "HOME-TEST" ] ++ (builtins.attrNames self))
 #let
 #  nixosConfiguration =
@@ -29,12 +29,10 @@
 #      username = "wtf";
 #    };
 #  home = home1 // { homeDirectory = "/home/${home1.username}"; };
-#  #builtins.trace "hmBhole" {
-#  #  inherit (nixosConfiguration) bee;
-#  #  inherit home;
-#  #}
 #in
 {
+  inherit (super.meta.nixosConfiguration) bee;
+
   imports = with inputs; [ nix-flatpak.homeManagerModules.nix-flatpak ];
 
   #inherit (self.meta.nixosConfiguration) bee;
@@ -50,16 +48,10 @@
   #  homeDirectory = "/home/${username}";
   #};
 
-  bee = {
-    #inherit (inputs) darwin home;
-    inherit (inputs) home;
-    #inherit (self) system;
-    system = "x86_64-linux";
-    pkgs = cell.pkgs.unstable-with-overlays;
-  };
-  home = {
-    stateVersion = "24.05";
+  home = rec {
+    inherit (super.meta.nixosConfiguration.system) stateVersion;
+    #stateVersion = "24.05";
     username = "red";
-    homeDirectory = "/home/red";
+    homeDirectory = "/home/${username}";
   };
 }
diff --git a/nix/hive/hosts/test/meta.nix b/nix/hive/hosts/test/meta.nix
@@ -1,44 +1,32 @@
-{ self, inputs, cell, ... }@args:
+{ self, super, root, inputs, cell, ... }@args:
 #builtins.trace ([ "TEST-META" ] ++ (builtins.attrNames args))
 {
   myargs = args;
   system = "x86_64-linux";
   specialArgs = { user = "sam"; };
+
+  # Colmena args: meta
+  # Args: allowApplyAll, description, machinesFile, name, nixpkgs, nodeNixpkgs, nodeSpecialArgs, specialArgs,
   colmena = {
+    description = "Lehmanator's Hive";
+    allowApplyAll = true;
     nixpkgs = { system = "x86_64-linux"; }; # Is this `nixpkgs.config`?
   };
   colmenaConfiguration = {
     inherit (self.nixosConfiguration) bee imports;
     deployment = {
       allowLocalDeployment = true;
+      buildOnTarget = false;
       tags = [ "test" ];
-      #buildOnTarget = false;
-      #replaceUnknownProfiles = true;
-      #keys = { };
-      #privilegeEscalationCommand = [ "sudo" "-H" "--" ];
-      #targetHost = "127.0.0.1";
-      #targetPort = null;
-      #targetUser = "root";
-      #sshOptions = [ ];
     };
   };
-  #homeConfiguration = {
-  #  inherit (self.nixosConfiguration) bee; # imports;
-  #  home = rec {
-  #    inherit (self.nixosConfiguration.system) stateVersion;
-  #    username = self.specialArgs.user;
-  #    homeDirectory = "/home/${username}";
-  #  };
-  #  imports = with inputs; [
-  #    nix-flatpak.homeManagerModules.nix-flatpak
-  #  ];
-  #};
   nixosConfiguration = {
     system.stateVersion = "24.05";
     bee = {
       #inherit (self) system;
       system = "x86_64-linux";
-      #inherit (inputs.omnibus.flake.inputs) darwin;
+      inherit (inputs) wsl;
+      inherit (inputs.omnibus.flake.inputs) darwin;
       home = inputs.home-manager;
       pkgs = cell.pkgs.unstable-with-overlays;
       #pkgs = import inputs.nixpkgs {
@@ -93,6 +81,8 @@
       # --- std ---
       cell.nixosModules.debug
       #inputs.cells.android.nixosModules.attestation-server
+
+      cell.diskoConfigurations.test
     ];
   };
 }
diff --git a/nix/hive/pops/hosts.nix b/nix/hive/pops/hosts.nix
@@ -13,6 +13,7 @@
 inputs.hivebus.pops.hosts.addLoadExtender {
   load = {
     src = inputs.omnibus.flake.inputs.std.incl ../hosts [
+      "darwin-test"
       #"fajita"
       #"fajita-minimal"
       #"fw"