Rebase ghaf release 24.06

- Update flake.lock to ghaf 24.06 - Modify config-processor to use ghaf modules - Rename microvm interface id from "vm-*" to "tap-*" - Simplify some configs due to updated nixpkgs - Adapt app changes to new version: lisgd, squeekboard - Remove upstream package overlay which caused error in previous build - Remove local golang, go-app is now built with nixpkgs.buildGoModules - Issue remained: fmo-dci warning and added unused (not working) audiovm Signed-off-by: Anh Huy Bui <[email protected]>
tiiuae · Jul 12, 2024 · aba7bb6 · aba7bb6
1 parent 3c112f1
commit aba7bb6
Show file tree

Hide file tree

Showing 38 changed files with 778 additions and 1,731 deletions.
diff --git a/config-processor-hardware.nix b/config-processor-hardware.nix
@@ -43,16 +43,23 @@ let
         [
           microvm.nixosModules.host
           self.nixosModules.fmo-configs
+          self.nixosModules.ghaf-common
+          ghafOS.nixosModules.host
 
-          (import "${ghafOS}/modules/host")
-          (import "${ghafOS}/modules/virtualization/microvm/microvm-host.nix")
+          (import "${ghafOS}/modules/microvm/networking.nix")
+          (import "${ghafOS}/modules/microvm/virtualization/microvm/microvm-host.nix")
+
+          # WAR: ghaf mainline has audiovm hardcoded. This causes audiovm defined here
+          # This should be removed when audiovm on ghaf mainline is fixed.
+          (import "${ghafOS}/modules/microvm/virtualization/microvm/audiovm.nix")
           {
             ghaf = lib.mkMerge (
               [
                 {
                   hardware.x86_64.common.enable = true;
 
                   virtualization.microvm-host.enable = true;
+                  virtualization.microvm-host.networkSupport = true;
                   host.networking.enable = true;
 
                   # Enable all the default UI applications
@@ -81,7 +88,6 @@ let
         ]
         ++ updateHostConfig {inherit lib; inherit targetconf;}
         ++ map (vm: importvm vms.${vm}) (builtins.attrNames vms)
-        ++ (import "${ghafOS}/modules/module-list.nix")
         ++ extraModules
         ++ (if lib.hasAttr "extraModules" targetconf then targetconf.extraModules else []);
     };
@@ -90,7 +96,7 @@ let
     name = "${name}-${variant}";
     package = hostConfiguration.config.system.build.${hostConfiguration.config.formatAttr};
   };
-  debugModules = [(import "${ghafOS}/modules/development/usb-serial.nix") {ghaf.development.usb-serial.enable = true;}];
+  debugModules = [{ghaf.development.usb-serial.enable = true;}];
   targets = [
     (target "debug" debugModules)
     (target "release" [])

diff --git a/config-processor-installers.nix b/config-processor-installers.nix
@@ -43,7 +43,8 @@ let
       modules =
         [
           self.nixosModules.installer
-          (import "${ghafOS}/modules/host")
+          self.nixosModules.ghaf-common
+
           ({modulesPath, lib, config, ...}: {
             imports = [ (modulesPath + "/profiles/all-hardware.nix") ];
 
@@ -97,7 +98,7 @@ let
             isoImage.squashfsCompression = "lz4"; 
           }
         ]
-        ++ (import "${ghafOS}/modules/module-list.nix")
+        #++ (import "${ghafOS}/modules/module-list.nix")
         ++ extraModules
         ++ (if lib.hasAttr "extraModules" installerconf then installerconf.extraModules else []);
     };
@@ -106,7 +107,7 @@ let
     inherit installerImgCfg system;
     installerImgDrv = installerImgCfg.config.system.build.${installerImgCfg.config.formatAttr};
   };
-  debugModules = [(import "${ghafOS}/modules/development/usb-serial.nix") {ghaf.development.usb-serial.enable = true;}];
+  debugModules = [{ghaf.development.usb-serial.enable = true;}];
   targets = [
     (installer "debug" debugModules)
     (installer "release" [])