flake lock update

docs/default.nix

@@ -20,7 +20,6 @@ let
         # TODO this hides the other modules (e.g. microvm.nix)
         # But they are stilled passed as options modules ???
         if lib.strings.hasPrefix "ghaf" x.name then x else x // { visible = false; };
-      markdownByDefault = true;
     }).optionsCommonMark;
   combinedSrc = runCommandLocal "ghaf-doc-src" { } ''
     mkdir $out

flake.nix

@@ -114,11 +114,9 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
-    jetpack-nixos = {
-      #url = "github:anduril/jetpack-nixos
-      url = "github:anduril/jetpack-nixos/793716c1ca29a1be6d9bea84296a933c4acdddc1";
-      #inputs.nixpkgs.follows = "nixpkgs";
-    };
+    #jetpack-nixos.url = "flake:mylocaljetpack";
+    #pinned to the pr https://github.com/anduril/jetpack-nixos/pull/257 until merged
+    jetpack-nixos.url = "github:anduril/jetpack-nixos/4dc254268aea59921268206628b9d911b6703e9e";
 
     disko = {
       url = "github:nix-community/disko";

lib.nix

@@ -43,10 +43,14 @@ nixpkgs.lib.extend (
       lib.filterAttrs (
         _: value:
         let
-          platforms = lib.attrByPath [
-            "meta"
-            "platforms"
-          ] [ ] value;
+          platforms =
+            lib.attrByPath
+              [
+                "meta"
+                "platforms"
+              ]
+              [ ]
+              value;
         in
         lib.elem system platforms
       );

lib/mk-flash-script/default.nix

@@ -3,70 +3,6 @@
 #
 # Function to generate NVIDIA Jetson Orin flash script
 {
-  nixpkgs,
   hostConfiguration,
-  jetpack-nixos,
-  flash-tools-system,
 }:
-let
-  cfg = hostConfiguration.config.hardware.nvidia-jetpack;
-  inherit (jetpack-nixos.legacyPackages.${flash-tools-system}) flash-tools;
-
-  # jetpack-nixos has the cross-compilation set up in a slightly strange way,
-  # the packages under x86_64-linux are actually cross-compiled packages for
-  # aarch64-linux. So we will get devicePkgs from x86_64-linux if we are cross
-  # compiling, otherwise we end up building UEFI firmware etc. binaries used by
-  # flash-script natively.
-  isCross =
-    hostConfiguration.config.nixpkgs.buildPlatform.system
-    != hostConfiguration.config.nixpkgs.hostPlatform.system;
-  devicePkgsSystem = if isCross then "x86_64-linux" else "aarch64-linux";
-  devicePkgs =
-    jetpack-nixos.legacyPackages.${devicePkgsSystem}.devicePkgsFromNixosConfig
-      hostConfiguration.config;
-
-  inherit (jetpack-nixos.legacyPackages.${devicePkgsSystem}) l4tVersion;
-
-  flashScript = devicePkgs.mkFlashScript {
-    flash-tools = flash-tools.overrideAttrs (
-      {
-        postPatch ? "",
-        ...
-      }:
-      {
-        postPatch = postPatch + cfg.flashScriptOverrides.postPatch;
-      }
-    );
-    preFlashCommands =
-      nixpkgs.lib.optionalString (flash-tools-system == "aarch64-linux") ''
-        echo "WARNING! WARNING! WARNING!"
-        echo "You are trying to run aarch64-linux hosted version of the flash-script."
-        echo "It runs flashing tools with QEMU using user-mode emulation of x86 cpu."
-        echo "There are no known reports from anyone who would have gotten this working ever."
-        echo "If this fails, YOU HAVE BEEN WARNED, and don't open a bug report!"
-        echo ""
-      ''
-      + hostConfiguration.config.ghaf.hardware.nvidia.orin.flashScriptOverrides.preFlashCommands;
-  };
-
-  patchFlashScript =
-    builtins.replaceStrings
-      [
-        "@pzstd@"
-        "@sed@"
-        "@patch@"
-        "@l4tVersion@"
-        "@isCross@"
-      ]
-      [
-        "${nixpkgs.legacyPackages.${flash-tools-system}.zstd}/bin/pzstd"
-        "${nixpkgs.legacyPackages.${flash-tools-system}.gnused}/bin/sed"
-        "${nixpkgs.legacyPackages.${flash-tools-system}.patch}/bin/patch"
-        "${l4tVersion}"
-        "${if isCross then "true" else "false"}"
-      ];
-in
-nixpkgs.legacyPackages.${flash-tools-system}.writeShellApplication {
-  name = "flash-ghaf";
-  text = patchFlashScript flashScript;
-}
+hostConfiguration.pkgs.nvidia-jetpack.flashScript

modules/common/boot/systemd-boot-dtb.nix

@@ -23,7 +23,8 @@ in
 
   config = mkIf cfg.enable {
     boot.loader.systemd-boot = {
-      extraFiles."dtbs/${config.hardware.deviceTree.name}" = "${config.hardware.deviceTree.package}/${config.hardware.deviceTree.name}";
+      extraFiles."dtbs/${config.hardware.deviceTree.name}" =
+        "${config.hardware.deviceTree.package}/${config.hardware.deviceTree.name}";
       extraInstallCommands = ''
         # Find out the latest generation from loader.conf
         default_cfg=$(${pkgs.coreutils}/bin/cat /boot/loader/loader.conf | ${pkgs.gnugrep}/bin/grep default | ${pkgs.gawk}/bin/awk '{print $2}')

modules/common/security/apparmor/profiles/google-chrome.nix

@@ -9,7 +9,7 @@
 {
   ## Apparmor profile for Chromium
   config.security.apparmor.policies."bin.chrome" = lib.mkIf config.ghaf.security.apparmor.enable {
-    enforce = lib.mkForce true;
+    state = "enforce";
     profile = ''
       abi <abi/3.0>,
       include <tunables/global>

modules/desktop/graphics/fonts.nix

@@ -11,6 +11,10 @@ let
 in
 {
   config = lib.mkIf labwc.enable {
-    fonts.packages = builtins.attrValues { inherit (pkgs) inter fira-code-nerdfont hack-font; };
+    fonts.packages = [
+      pkgs.inter
+      pkgs.nerd-fonts.fira-code
+      pkgs.hack-font
+    ];
   };
 }