drop steev completely

README.md

@@ -30,13 +30,12 @@ Ensure you are not overriding the nixpkgs input when consuming this flake, or yo
           inputs.nixos-x13s.nixosModules.default
           {
             nixos-x13s.enable = true;
-            nixos-x13s.kernel = "jhovold"; # jhovold is default, but steev and mainline supported
+            nixos-x13s.kernel = "jhovold"; # jhovold is default, but mainline supported
 
             # install multiple kernels! note this increases eval time for each specialization
             specialisation = {
               # note that activation of each specialization is required to copy the dtb to the EFI, and thus boot
               mainline.configuration.nixos-x13s.kernel = "mainline";
-              steev.configuration.nixos-x13s.kernel = "steev";
             };
 
             # allow unfree firmware

flake.nix

@@ -28,12 +28,11 @@
           self.nixosModules.default
           {
             nixos-x13s.enable = true;
-            nixos-x13s.kernel = "jhovold"; # jhovold is default, but steev and mainline supported
+            nixos-x13s.kernel = "jhovold"; # jhovold is default, but mainline supported
 
             # install multiple kernels! note this increases eval time for each specialization
             specialisation = {
               mainline.configuration.nixos-x13s.kernel = "mainline";
-              steev.configuration.nixos-x13s.kernel = "steev";
             };
 
             # allow unfree firmware

module.nix

@@ -17,10 +17,6 @@ let
       pkgs.linuxPackagesFor (
         if cfg.kernel == "jhovold" then
           x13sPackages.linux_jhovold
-        else if cfg.kernel == "jhovold_6_7" then
-          x13sPackages.linux_jhovold_6_7
-        else if cfg.kernel == "steev" then
-          x13sPackages.linux_steev
         else
           throw "Unsupported kernel"
       );
@@ -39,11 +35,9 @@ in
     kernel = lib.mkOption {
       type = lib.types.enum [
         "jhovold"
-        "jhovold_6_7"
         "mainline"
-        "steev"
       ];
-      description = "which patched kernel to use. jhovold is the latest RC, steev is the latest patched release, and mainline is nixos latest";
+      description = "which patched kernel to use. jhovold is the latest RC, and mainline is nixos latest";
       default = "jhovold";
     };
   };

npins/sources.json

@@ -1,19 +1,5 @@
 {
   "pins": {
-    "alsa-ucm-conf": {
-      "type": "GitRelease",
-      "repository": {
-        "type": "GitHub",
-        "owner": "alsa-project",
-        "repo": "alsa-ucm-conf"
-      },
-      "pre_releases": false,
-      "version_upper_bound": null,
-      "version": "v1.2.11",
-      "revision": "c40b8cc795c8fe4c83582857d5e317f18a4c065e",
-      "url": "https://api.github.com/repos/alsa-project/alsa-ucm-conf/tarball/v1.2.11",
-      "hash": "1jcn0x6bbg69p1ygxnh1zn33sd9lpbll4bnhvkzw1fjpmw7igjkz"
-    },
     "linux-jhovold": {
       "type": "Git",
       "repository": {
@@ -25,17 +11,6 @@
       "revision": "5fbfdc8826150355307394e193c168b45adfa316",
       "url": "https://github.com/jhovold/linux/archive/5fbfdc8826150355307394e193c168b45adfa316.tar.gz",
       "hash": "1crapwv9fbyffpc8mh8hniawvidhphdxdvx1nssylxk3zr9gcbw4"
-    },
-    "linux-steev": {
-      "type": "Git",
-      "repository": {
-        "type": "Git",
-        "url": "https://github.com/steev/linux.git"
-      },
-      "branch": "lenovo-x13s-linux-6.8.y",
-      "revision": "f1845c1b1a370fae44589f9ed1e9861ff713f0b0",
-      "url": null,
-      "hash": "1pgvc2gyjfd30b380h53m5bzjngchk6f7dcfnm4viqajsv4vmh4v"
     }
   },
   "version": 3

packages/default.nix

@@ -15,54 +15,12 @@ let
     );
 in
 rec {
-  linux_jhovold = linux_jhovold_6_8;
+  linux_jhovold = pkgs.callPackage linux_x13s_pkg {
-
-  linux_jhovold_6_8 = pkgs.callPackage linux_x13s_pkg {
     src = sources.linux-jhovold;
     version = "6.8.0";
     defconfig = "johan_defconfig";
   };
 
-  linux_steev = pkgs.callPackage linux_x13s_pkg {
-    src = sources.linux-steev;
-    version = "6.8.1";
-    defconfig = "laptop_defconfig";
-
-    # fix build using extra config from
-    # https://github.com/boletus-edulis/hydra-test/blob/fffbd42c511e7384be76dc88ea246bc7064d7b49/pkgs/linux_x13s.nix
-    structuredExtraConfig = with lib.kernel; {
-      VIDEO_AR1337 = no;
-      AUDIT = yes;
-      ARM64_SME = yes;
-      MAC80211_LEDS = yes;
-      FW_LOADER_USER_HELPER = yes;
-      QCOM_EBI2 = yes;
-      EFI_CAPSULE_LOADER = yes;
-      SRAM = yes;
-      KEYBOARD_GPIO = yes;
-      SERIAL_QCOM_GENI = yes;
-      PINCTRL_QCOM_SPMI_PMIC = yes;
-      PINCTRL_SC8280XP_LPASS_LPI = module;
-      QCOM_TSENS = yes;
-      BACKLIGHT_CLASS_DEVICE = yes;
-      VIRTIO_MENU = yes;
-      VHOST_MENU = yes;
-      SC_GCC_8280XP = yes;
-      SC_GPUCC_8280XP = yes;
-      QCOM_Q6V5_ADSP = module;
-      QCOM_STATS = yes;
-      QCOM_CPR = yes;
-      QCOM_RPMHPD = yes;
-      QCOM_RPMPD = yes;
-      PHY_QCOM_QMP_PCIE_8996 = yes;
-      NVMEM_QCOM_QFPROM = yes;
-      CRYPTO_AES_ARM64_CE_BLK = yes;
-      CRYPTO_AES_ARM64_BS = yes;
-      CRYPTO_AES_ARM64_CE_CCM = yes;
-      CONFIG_CRYPTO_DEV_CCREE = module;
-    };
-  };
-
   pd-mapper = pkgs.callPackage ./pd-mapper { inherit qrtr; };
   qrtr = pkgs.callPackage ./qrtr { };