init: x13s module and packages

packages/default.nix

@@ -0,0 +1,64 @@
+{ lib, pkgs, ... }:
+let
+  sources = import ../npins;
+  kp = [
+    {
+      name = "x13s-cfg";
+      patch = null;
+      extraStructuredConfig = with lib.kernel; {
+        EFI_ARMSTUB_DTB_LOADER = lib.mkForce yes;
+        OF_OVERLAY = lib.mkForce yes;
+        BTRFS_FS = lib.mkForce yes;
+        BTRFS_FS_POSIX_ACL = lib.mkForce yes;
+        MEDIA_CONTROLLER = lib.mkForce yes;
+        SND_USB_AUDIO_USE_MEDIA_CONTROLLER = lib.mkForce yes;
+        SND_USB = lib.mkForce yes;
+        SND_USB_AUDIO = lib.mkForce module;
+        USB_XHCI_PCI = lib.mkForce module;
+        NO_HZ_FULL = lib.mkForce yes;
+        HZ_100 = lib.mkForce yes;
+        HZ_250 = lib.mkForce no;
+        DRM_AMDGPU = lib.mkForce no;
+        DRM_NOUVEAU = lib.mkForce no;
+        QCOM_TSENS = lib.mkForce yes;
+        NVMEM_QCOM_QFPROM = lib.mkForce yes;
+        ARM_QCOM_CPUFREQ_NVMEM = lib.mkForce yes;
+        VIRTIO_PCI = lib.mkForce module;
+        # forthcoming kernel work: QCOM_PD_MAPPER = lib.mkForce module;
+      };
+    }
+  ];
+
+  linux_x13s_pkg =
+    { buildLinux, ... }@args:
+    let
+      version = "6.7.0";
+      modDirVersion = "${version}";
+    in
+    buildLinux (
+      args
+      // {
+        inherit version modDirVersion;
+
+        src = sources.jhovold-linux;
+
+        kernelPatches = (args.kernelPatches or [ ]) ++ kp;
+        extraMeta.branch = lib.versions.majorMinor version;
+      }
+      // (args.argsOverride or { })
+    );
+in
+rec {
+  "x13s/linux" = pkgs.callPackage linux_x13s_pkg { defconfig = "johan_defconfig"; };
+  "x13s/alsa-ucm-conf" = pkgs.alsa-ucm-conf.overrideAttrs (
+    prev: rec {
+      version = "1.2.11-unstable-${builtins.substring 0 7 src.revision}";
+      src = sources.alsa-ucm-conf;
+    }
+  );
+
+  pd-mapper = pkgs.callPackage ./pd-mapper { inherit qrtr; };
+  qrtr = pkgs.callPackage ./qrtr { };
+
+  "x13s/extra-firmware" = pkgs.callPackage ./extra-firmware.nix { };
+}

packages/extra-firmware.nix

@@ -0,0 +1,21 @@
+{ stdenvNoCC, fetchFromGitHub }:
+
+stdenvNoCC.mkDerivation {
+  pname = "x13s-extra-firmware";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ironrobin";
+    repo = "x13s-alarm";
+    rev = "efa51c3b519f75b3983aef67855b1561d9828771";
+    sha256 = "sha256-weETbWXz9aL2pDQDKk7fkb1ecQH0qrhUYDs2E5EiJcI=";
+  };
+
+  dontFixup = true;
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/lib/firmware/qcom/sc8280xp/LENOVO/21BX
+    cp x13s-firmware/qcvss8280.mbn $out/lib/firmware/qcom/sc8280xp/LENOVO/21BX/
+  '';
+}

packages/part.nix

@@ -0,0 +1,6 @@
+{ lib, withSystem, ... }:
+{
+  flake.packages.aarch64-linux = withSystem "aarch64-linux" (
+    { pkgs, ... }: import ./default.nix { inherit lib pkgs; }
+  );
+}

packages/pd-mapper/default.nix

@@ -0,0 +1,36 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qrtr,
+  xz,
+}:
+
+stdenv.mkDerivation {
+  pname = "pd-mapper";
+  version = "unstable-2023-09-01";
+
+  buildInputs = [
+    qrtr
+    xz
+  ];
+
+  src = fetchFromGitHub {
+    owner = "andersson";
+    repo = "pd-mapper";
+    rev = "10997ba7c43a3787a40b6b1b161408033e716374";
+    hash = "sha256-qGrYNoPCxtdpTdbkSmB39+6/pSXml96Aul8b9opF9Lc=";
+  };
+
+  patches = [ ./pd-mapper-firmware-path.diff ];
+
+  installFlags = [ "prefix=$(out)" ];
+
+  meta = with lib; {
+    description = "Qualcomm PD mapper";
+    homepage = "https://github.com/andersson/pd-mapper";
+    license = licenses.bsd3;
+    mainProgram = "pd-mapper";
+    platforms = platforms.aarch64;
+  };
+}

packages/pd-mapper/pd-mapper-firmware-path.diff

@@ -0,0 +1,13 @@
+diff --git a/pd-mapper.c b/pd-mapper.c
+index 65c4b80..669d9a0 100644
+--- a/pd-mapper.c
++++ b/pd-mapper.c
+@@ -194,7 +194,7 @@ static int pd_load_map(const char *file)
+ }
+ 
+ #ifndef ANDROID
+-#define FIRMWARE_BASE	"/lib/firmware/"
++#define FIRMWARE_BASE	"/run/current-system/firmware/"
+ #else
+ #define FIRMWARE_BASE	"/vendor/firmware/"
+ #endif

packages/qrtr/default.nix

@@ -0,0 +1,26 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation {
+  pname = "qrtr";
+  version = "unstable-2023-01-17";
+
+  src = fetchFromGitHub {
+    owner = "andersson";
+    repo = "qrtr";
+    rev = "d0d471c96e7d112fac6f48bd11f9e8ce209c04d2";
+    hash = "sha256-KF0gCBRw3BDJdK1s+dYhHkokVTHwRFO58ho0IwHPehc=";
+  };
+
+  installFlags = [ "prefix=$(out)" ];
+
+  meta = with lib; {
+    description = "QMI IDL compiler";
+    homepage = "https://github.com/andersson/qrtr";
+    license = licenses.bsd3;
+    platforms = platforms.aarch64;
+  };
+}