From 455ea26cdc6ed9d346e25bc058c5ded19e3407be Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Wed, 14 Jan 2026 18:38:22 -0600
Subject: [PATCH] cleanup

---
 flake.nix                          |  5 ++++
 overlays/linux-cachyos/default.nix | 10 -------
 overlays/linux-rpi/default.nix     | 46 ++++++++++++++++++++++++++++++
 systems/aarch64-linux/pi4/boot.nix |  2 +-
 systems/aarch64-linux/pi5/boot.nix |  2 +-
 5 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 overlays/linux-rpi/default.nix

diff --git a/flake.nix b/flake.nix
index 0026dd5..22e23b5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -144,6 +144,10 @@
           stylix.nixosModules.stylix
         ];
 
+        modules.home = with inputs; [
+          nix-index-database.homeManagerModules.nix-index
+        ];
+
         # common darwin modules
         modules.darwin = with inputs; [
           nix-homebrew.darwinModules.nix-homebrew
@@ -283,6 +287,7 @@
 
       channels-config = {
         allowUnfree = true;
+        allowUnsupportedSystem = true;
         permittedInsecurePackages = [
           # ...
           # "libsoup-2.74.3"
diff --git a/overlays/linux-cachyos/default.nix b/overlays/linux-cachyos/default.nix
index fdea272..bc4c2bf 100644
--- a/overlays/linux-cachyos/default.nix
+++ b/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;
-      }
-    );
   };
 }
diff --git a/overlays/linux-rpi/default.nix b/overlays/linux-rpi/default.nix
new file mode 100644
index 0000000..ec03620
--- /dev/null
+++ b/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;
+    });
+  };
+}
diff --git a/systems/aarch64-linux/pi4/boot.nix b/systems/aarch64-linux/pi4/boot.nix
index 26bcfbd..9321540 100755
--- a/systems/aarch64-linux/pi4/boot.nix
+++ b/systems/aarch64-linux/pi4/boot.nix
@@ -12,7 +12,7 @@
     #   };
     #   kernelPackages = kernelBundle.linuxPackages_rpi4;
     # kernelPackages = pkgs.${namespace}.linuxPackages_cachyos-lto;
-    kernelPackages = pkgs.${namespace}.linuxPackages_rpi4;
+    kernelPackages = pkgs.${namespace}.linuxPackages_rpi4-lts;
     supportedFilesystems = lib.mkForce [ ];
   };
 
diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix
index 116d3c8..0fd855a 100755
--- a/systems/aarch64-linux/pi5/boot.nix
+++ b/systems/aarch64-linux/pi5/boot.nix
@@ -10,7 +10,7 @@
     #   bootloader = "kernel";
     #   firmwarePackage = pkgs.raspberrypifw;
     # };
-    kernelPackages = pkgs.${namespace}.linuxPackages_rpi5;
+    kernelPackages = pkgs.${namespace}.linuxPackages_rpi5-lts;
     supportedFilesystems = lib.mkForce [ ];
   };