cleanup

overlays/linux-cachyos/default.nix

@@ -12,7 +12,6 @@ let
     nixpkgs = inputs.nixpkgs;
     inherit self;
   };
-  ubootPackages = final.callPackage ../../packages/uboot { };
 in
 {
   ${namespace} = prev.${namespace} // {
@@ -51,14 +50,5 @@ in
     linuxPackages_cachyos-rc-lto-znver4 = cachyosPackages.cachyos-rc-lto-znver4;
     # Steamdeck
     linuxPackages_cachyos-deckify-lto = cachyosPackages.cachyos-deckify-lto;
-
-    uboot-pi5 = ubootPackages.ubootRaspberryPi5;
-    uboot-pi4 = ubootPackages.ubootRaspberryPi4;
-    linuxPackages_rpi5 = final.linuxPackagesFor (final.${namespace}.linux-rpi);
-    linuxPackages_rpi4 = final.linuxPackagesFor (
-      final.${namespace}.linux-rpi.override {
-        rpiVersion = 4;
-      }
-    );
   };
 }

overlays/linux-rpi/default.nix

@@ -0,0 +1,46 @@
+{
+  inputs,
+  self,
+  namespace,
+  ...
+}:
+
+final: prev:
+let
+  ubootPackages = final.callPackage ../../packages/uboot { };
+
+  linux618Src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "linux";
+    rev = "bb594fb36f555f9b88b7b6fcf8b71c669c1d60c7";
+    hash = "sha256-T3RJRroYtzLwx4JqcaX15Ka1uVf72jQOZMf7TJVZ6co=";
+  };
+
+  linux619Src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "linux";
+    rev = "12e23f26704f66c154de58f80222960f02885570";
+    hash = "sha256-C81aKv+pQYNx6Bj3PL0vrxvBzrLB99+95YeIBm+4kt0=";
+  };
+in
+{
+  ${namespace} = prev.${namespace} // {
+    uboot-pi5 = ubootPackages.ubootRaspberryPi5;
+    uboot-pi4 = ubootPackages.ubootRaspberryPi4;
+
+    linuxPackages_rpi5-lts = final.linuxPackagesFor (final.${namespace}.linux-rpi);
+    linuxPackages_rpi4-lts = final.linuxPackagesFor (
+      final.${namespace}.linux-rpi.override {
+        rpiVersion = 4;
+      }
+    );
+    linuxPackages_rpi5-latest = linuxPackages_rpi5-lts.overrideAttrs (old: {
+      modDirVersion = "6.18.4";
+      src = linux618Src;
+    });
+    linuxPackages_rpi5-rc = linuxPackages_rpi5-lts.overrideAttrs (old: {
+      modDirVersion = "6.19.0-rc5";
+      src = linux619Src;
+    });
+  };
+}