diff --git a/modules/home/home/default.nix b/modules/home/home/default.nix
index e2de0c5..3e7ade9 100644
--- a/modules/home/home/default.nix
+++ b/modules/home/home/default.nix
@@ -128,7 +128,7 @@ in
   };
 
   services = {
-    nextcloud-client.enable = false;#lib.mkDefault hasDestopEnvironment;
+    nextcloud-client.enable = false; # lib.mkDefault hasDestopEnvironment;
     pass-secret-service = lib.mkDefault enabled;
     kdeconnect = {
       enable = lib.mkDefault hasDestopEnvironment;
diff --git a/modules/nixos/hardware/raspberry-pi/apply-overlays-dtmerge.nix b/modules/nixos/hardware/raspberry-pi/apply-overlays-dtmerge.nix
index 2111ce2..ab6d529 100644
--- a/modules/nixos/hardware/raspberry-pi/apply-overlays-dtmerge.nix
+++ b/modules/nixos/hardware/raspberry-pi/apply-overlays-dtmerge.nix
@@ -64,4 +64,4 @@ with lib;
 
         done'';
   }
-)
\ No newline at end of file
+)
diff --git a/modules/nixos/hardware/raspberry-pi/audio.nix b/modules/nixos/hardware/raspberry-pi/audio.nix
index 307182d..0af0485 100644
--- a/modules/nixos/hardware/raspberry-pi/audio.nix
+++ b/modules/nixos/hardware/raspberry-pi/audio.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, namespace, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
 let
   cfg = config.${namespace}.hardware.raspberry-pi.audio;
   variant = config.${namespace}.hardware.raspberry-pi.variant;
@@ -10,21 +16,26 @@ in
 
   config = lib.mkIf cfg.enable {
     hardware.deviceTree = {
-      overlays = 
-      [ ] ++ (if (variant == "5") then 
-      [
-        {
-          name = "pisound-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-pi5-overlay.dts";
-        }
-      ]
-      else
-      [
-        {
-          name = "pisound-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts";
-        }
-      ]);
+      overlays =
+        [ ]
+        ++ (
+          if (variant == "5") then
+            [
+              {
+                name = "pisound-pi5-overlay";
+                dtsFile = "${
+                  pkgs.${namespace}.raspberrypi-overlays
+                }/dtbs/raspberrypi-overlays/pisound-pi5-overlay.dts";
+              }
+            ]
+          else
+            [
+              {
+                name = "pisound-overlay";
+                dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts";
+              }
+            ]
+        );
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/bluetooth.nix b/modules/nixos/hardware/raspberry-pi/bluetooth.nix
index 41cf356..e93d1eb 100644
--- a/modules/nixos/hardware/raspberry-pi/bluetooth.nix
+++ b/modules/nixos/hardware/raspberry-pi/bluetooth.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, namespace, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
 let
   cfg = config.${namespace}.hardware.raspberry-pi.disable-bluetooth;
   variant = config.${namespace}.hardware.raspberry-pi.variant;
@@ -10,21 +16,28 @@ in
 
   config = lib.mkIf cfg.enable {
     hardware.deviceTree = {
-      overlays = 
-      [ ] ++ (if (variant == "5") then 
-      [
-        {
-          name = "disable-bt-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/disable-bt-pi5-overlay.dts";
-        }
-      ]
-      else
-      [
-        {
-          name = "disable-bt-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/disable-bt-overlay.dts";
-        }
-      ]);
+      overlays =
+        [ ]
+        ++ (
+          if (variant == "5") then
+            [
+              {
+                name = "disable-bt-pi5-overlay";
+                dtsFile = "${
+                  pkgs.${namespace}.raspberrypi-overlays
+                }/dtbs/raspberrypi-overlays/disable-bt-pi5-overlay.dts";
+              }
+            ]
+          else
+            [
+              {
+                name = "disable-bt-overlay";
+                dtsFile = "${
+                  pkgs.${namespace}.raspberrypi-overlays
+                }/dtbs/raspberrypi-overlays/disable-bt-overlay.dts";
+              }
+            ]
+        );
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/config.nix b/modules/nixos/hardware/raspberry-pi/config.nix
index c35aab7..ac4aa54 100644
--- a/modules/nixos/hardware/raspberry-pi/config.nix
+++ b/modules/nixos/hardware/raspberry-pi/config.nix
@@ -4,161 +4,199 @@
 # with modifications
 # https://raw.githubusercontent.com/nvmd/raspberry-pi-nix/refs/heads/master/rpi/config.nix
 
-{ lib, config, pkgs, namespace, ... }:
+{
+  lib,
+  config,
+  namespace,
+  ...
+}:
 let
   cfg = config.${namespace}.hardware.raspberry-pi;
 
-  render-raspberrypi-config = let
+  render-raspberrypi-config =
+    let
 
-    render-kvs = kvs: let
-      render-kv = k: v:
-        if isNull v.value then k
-        else "${k}=${toString v.value}";
-    in lib.attrsets.mapAttrsToList render-kv
-        (lib.filterAttrs (k: v: v.enable) kvs);
+      render-kvs =
+        kvs:
+        let
+          render-kv = k: v: if isNull v.value then k else "${k}=${toString v.value}";
+        in
+        lib.attrsets.mapAttrsToList render-kv (lib.filterAttrs (_k: v: v.enable) kvs);
 
-    render-dt-param = x: "dtparam=" + x;
-    render-dt-params = params:
-      lib.strings.concatMapStringsSep "\n" render-dt-param (render-kvs params);
+      render-dt-param = x: "dtparam=" + x;
+      render-dt-params = params: lib.strings.concatMapStringsSep "\n" render-dt-param (render-kvs params);
 
-    render-dt-overlay = { overlay, params }:
-      lib.concatStringsSep "\n" (lib.filter (x: x != "") [
-        ("dtoverlay=" + overlay)
-        (render-dt-params params)
-        "dtoverlay="
-      ]);
+      render-dt-overlay =
+        { overlay, params }:
+        lib.concatStringsSep "\n" (
+          lib.filter (x: x != "") [
+            ("dtoverlay=" + overlay)
+            (render-dt-params params)
+            "dtoverlay="
+          ]
+        );
 
-    render-options = opts:
-      lib.strings.concatStringsSep "\n" (render-kvs opts);
+      render-options = opts: lib.strings.concatStringsSep "\n" (render-kvs opts);
 
-    render-base-dt-params = render-dt-params;
+      render-base-dt-params = render-dt-params;
 
-    render-dt-overlays = overlays:
-      lib.strings.concatMapStringsSep "\n" render-dt-overlay
-        (lib.attrsets.mapAttrsToList
-          (overlay: params: {
+      render-dt-overlays =
+        overlays:
+        lib.strings.concatMapStringsSep "\n" render-dt-overlay (
+          lib.attrsets.mapAttrsToList (overlay: params: {
             inherit overlay;
             inherit (params) params;
-          })
-          (lib.filterAttrs (k: v: v.enable) overlays));
+          }) (lib.filterAttrs (_k: v: v.enable) overlays)
+        );
 
-    render-config-section = conditionalFilter:
-      { options, base-dt-params, dt-overlays }:
-      let all-config = lib.concatStringsSep "\n" (lib.filter (x: x != "") [
-          (render-options options)
-          (render-base-dt-params base-dt-params)
-          (render-dt-overlays dt-overlays)
-        ]);
-      in ''
-        [${conditionalFilter}]
-        ${all-config}
-      '';
-  in conf: lib.strings.concatStringsSep "\n"
-      ((lib.attrsets.mapAttrsToList render-config-section conf)
-      ++ [ cfg.extra-config ]);
-in {
+      render-config-section =
+        conditionalFilter:
+        {
+          options,
+          base-dt-params,
+          dt-overlays,
+        }:
+        let
+          all-config = lib.concatStringsSep "\n" (
+            lib.filter (x: x != "") [
+              (render-options options)
+              (render-base-dt-params base-dt-params)
+              (render-dt-overlays dt-overlays)
+            ]
+          );
+        in
+        ''
+          [${conditionalFilter}]
+          ${all-config}
+        '';
+    in
+    conf:
+    lib.strings.concatStringsSep "\n" (
+      (lib.attrsets.mapAttrsToList render-config-section conf) ++ [ cfg.extra-config ]
+    );
+in
+{
   options.${namespace}.hardware.raspberry-pi = {
-    config = let
-      rpi-config-param = {
-        options = {
-          enable = lib.mkEnableOption "attr";
-          value = lib.mkOption {
-            type = with lib.types; oneOf [ int str bool ];
-          };
-        };
-      };
-      dt-param = {
-        options = {
-          enable = lib.mkEnableOption "attr";
-          value = lib.mkOption {
-            type = with lib.types; nullOr (oneOf [ int str bool ]);
-            default = null;
-          };
-        };
-      };
-      dt-overlay = {
-        options = {
-          enable = lib.mkEnableOption "overlay";
-          params = lib.mkOption {
-            type = with lib.types; attrsOf (submodule dt-param);
-            default = {};
-          };
-        };
-      };
-      raspberry-pi-config-options = {
-        options = {
-          options = lib.mkOption {
-            type = with lib.types; attrsOf (submodule rpi-config-param);
-            default = { };
-            description = ''
-              Common hardware configuration options, translates to
-              `<option>=<value>` in the `config.txt`.
-              <https://www.raspberrypi.com/documentation/computers/config_txt.html#common-hardware-configuration-options>
-            '';
-            example = {
-              arm_boost = { # arm_boost=1
-                enable = true;
-                value = true;
-              };
+    config =
+      let
+        rpi-config-param = {
+          options = {
+            enable = lib.mkEnableOption "attr";
+            value = lib.mkOption {
+              type =
+                with lib.types;
+                oneOf [
+                  int
+                  str
+                  bool
+                ];
             };
           };
-          base-dt-params = lib.mkOption {
-            type = with lib.types; attrsOf (submodule dt-param);
-            default = { };
-            description = ''
-              Parameters to pass to the base DTB, translates to
-              `dtparam=<param>=<value>` in the `config.txt`.
-              <https://www.raspberrypi.com/documentation/computers/configuration.html#part3.2>
-            '';
-            example = {
-              i2c = { # dtparam=i2c=on
-                enable = true;
-                value = "on";
-              };
-              ant2 = {  # dtparam=ant2
-                enable = true;
-              };
+        };
+        dt-param = {
+          options = {
+            enable = lib.mkEnableOption "attr";
+            value = lib.mkOption {
+              type =
+                with lib.types;
+                nullOr (oneOf [
+                  int
+                  str
+                  bool
+                ]);
+              default = null;
             };
           };
-          dt-overlays = lib.mkOption {
-            type = with lib.types; attrsOf (submodule dt-overlay);
-            default = { };
-            description = ''
-              DTB overlays to enable and configure with parameters, translates to
-              ```
-               dtoverlay=<overlay>
-               dtparam=<param>=<value>
-               dtoverlay=
-              ```, which is an equivalent to a more popular format of
-              `dtoverlay=<overlay>,<param>=<value>`.
-              <https://www.raspberrypi.com/documentation/computers/configuration.html#part3.1>
-            '';
-            example = {
-              vc4-kms-v3d = { # dtoverlay=vc4-kms-v3d,cma-256
-                enable = true;
-                params = {
-                  cma-256 = {
-                    enable = true;
-                    # value = "";
-                  };
+        };
+        dt-overlay = {
+          options = {
+            enable = lib.mkEnableOption "overlay";
+            params = lib.mkOption {
+              type = with lib.types; attrsOf (submodule dt-param);
+              default = { };
+            };
+          };
+        };
+        raspberry-pi-config-options = {
+          options = {
+            options = lib.mkOption {
+              type = with lib.types; attrsOf (submodule rpi-config-param);
+              default = { };
+              description = ''
+                Common hardware configuration options, translates to
+                `<option>=<value>` in the `config.txt`.
+                <https://www.raspberrypi.com/documentation/computers/config_txt.html#common-hardware-configuration-options>
+              '';
+              example = {
+                arm_boost = {
+                  # arm_boost=1
+                  enable = true;
+                  value = true;
                 };
               };
-              disable-bt = {  # dtoverlay=disable-bt
-                enable = true;
+            };
+            base-dt-params = lib.mkOption {
+              type = with lib.types; attrsOf (submodule dt-param);
+              default = { };
+              description = ''
+                Parameters to pass to the base DTB, translates to
+                `dtparam=<param>=<value>` in the `config.txt`.
+                <https://www.raspberrypi.com/documentation/computers/configuration.html#part3.2>
+              '';
+              example = {
+                i2c = {
+                  # dtparam=i2c=on
+                  enable = true;
+                  value = "on";
+                };
+                ant2 = {
+                  # dtparam=ant2
+                  enable = true;
+                };
+              };
+            };
+            dt-overlays = lib.mkOption {
+              type = with lib.types; attrsOf (submodule dt-overlay);
+              default = { };
+              description = ''
+                DTB overlays to enable and configure with parameters, translates to
+                ```
+                 dtoverlay=<overlay>
+                 dtparam=<param>=<value>
+                 dtoverlay=
+                ```, which is an equivalent to a more popular format of
+                `dtoverlay=<overlay>,<param>=<value>`.
+                <https://www.raspberrypi.com/documentation/computers/configuration.html#part3.1>
+              '';
+              example = {
+                vc4-kms-v3d = {
+                  # dtoverlay=vc4-kms-v3d,cma-256
+                  enable = true;
+                  params = {
+                    cma-256 = {
+                      enable = true;
+                      # value = "";
+                    };
+                  };
+                };
+                disable-bt = {
+                  # dtoverlay=disable-bt
+                  enable = true;
+                };
               };
             };
           };
         };
+      in
+      lib.mkOption {
+        type = with lib.types; attrsOf (submodule raspberry-pi-config-options);
+        description = ''
+          Configures `config.txt` file for Raspberry Pi devices.
+          The file is located on a firmware partition, usually mounted at
+          `/boot/firmware`.
+          <https://www.raspberrypi.com/documentation/computers/config_txt.html>
+        '';
       };
-    in lib.mkOption {
-      type = with lib.types; attrsOf (submodule raspberry-pi-config-options);
-      description = ''
-        Configures `config.txt` file for Raspberry Pi devices.
-        The file is located on a firmware partition, usually mounted at
-        `/boot/firmware`.
-        <https://www.raspberrypi.com/documentation/computers/config_txt.html>
-      '';
-    };
 
     extra-config = lib.mkOption {
       type = lib.types.lines;
@@ -181,4 +219,4 @@ in {
   config = {
     ${namespace}.hardware.raspberry-pi.config-generated = render-raspberrypi-config cfg.config;
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/default.nix b/modules/nixos/hardware/raspberry-pi/default.nix
index 79ac1a8..2cfb035 100644
--- a/modules/nixos/hardware/raspberry-pi/default.nix
+++ b/modules/nixos/hardware/raspberry-pi/default.nix
@@ -12,24 +12,6 @@ let
       applyOverlays = _final.callPackage ./apply-overlays-dtmerge.nix { };
     };
   };
-  
-  ubootBinName = "u-boot.bin";
-
-  deviceTree = ({ pkgs
-                , firmware
-                }: pkgs.replaceVarsWith {
-    src = ./generational/install-device-tree.sh;
-    isExecutable = true;
-
-    replacements = {
-      inherit (pkgs) bash;
-      path = pkgs.lib.makeBinPath [
-        pkgs.coreutils
-      ];
-
-      inherit firmware;
-    };
-  });
 
   # installs raspberry's firmware independent of the nixos generations
   # sometimes referred to as "boot code"
@@ -50,38 +32,128 @@ let
     };
   });
 
-  # Builders used to write during system activation
-  firmwareBuilder = import ./firmware-builder.nix {
-    inherit pkgs;
-    configTxt = pkgs.writeTextFile {
-      name = "config.txt";
-      text = ''
-        # Do not edit!
-        # This configuration file is generated from NixOS configuration
-        # options `hardware.raspberry-pi.config`.
-        # Any manual changes will be overwritten on the next configuration
-        # switch.
-        ${config.${namespace}.hardware.raspberry-pi.config-generated}
-      '';
+  kernelbootGenBuilder = ({ pkgs
+                          , deviceTreeInstaller
+                          }: pkgs.replaceVarsWith {
+    src = ./generational/kernelboot-gen-builder.sh;
+    isExecutable = true;
+
+    replacements = {
+      inherit (pkgs) bash;
+      path = pkgs.lib.makeBinPath [
+        pkgs.coreutils
+      ];
+
+      installDeviceTree = deviceTreeInstaller;
     };
-    firmware = pkgs.${namespace}.raspberrypifw;
+  });
+
+  deviceTree = ({ pkgs
+                , firmware
+                }: pkgs.replaceVarsWith {
+    src = ./generational/install-device-tree.sh;
+    isExecutable = true;
+
+    replacements = {
+      inherit (pkgs) bash;
+      path = pkgs.lib.makeBinPath [
+        pkgs.coreutils
+      ];
+
+      inherit firmware;
+    };
+  });
+
+  mkBootloader = pkgs: bootloader {
+    inherit pkgs;
+    inherit (cfg) nixosGenerationsDir;
+
+    firmwareInstaller = "${raspberryPiFirmware {
+      inherit pkgs;
+      firmware = pkgs.${namespace}.raspberrypifw;
+      configTxt = pkgs.writeTextFile {
+        name = "config.txt";
+        text = ''
+          # Do not edit!
+          # This configuration file is generated from NixOS configuration
+          # options `hardware.raspberry-pi.config`.
+          # Any manual changes will be overwritten on the next configuration
+          # switch.
+          ${config.${namespace}.hardware.raspberry-pi.config-generated}
+        '';
+      };
+    }}";
+
+    nixosGenBuilder = "${kernelbootGenBuilder {
+      inherit pkgs;
+      deviceTreeInstaller = let
+        cmd = deviceTree {
+          inherit pkgs;
+          firmware = cfg.firmwarePackage;
+        };
+        args = lib.optionalString (!cfg.useGenerationDeviceTree) " -r";
+      in "${cmd} ${args}";
+    }}";
+
   };
 
+  bootloader = ({ pkgs
+                , nixosGenerationsDir
+                , firmwareInstaller
+                , nixosGenBuilder
+                }: pkgs.replaceVarsWith {
+    src = ./generational/nixos-generations-builder.sh;
+    isExecutable = true;
+
+    replacements = {
+      inherit (pkgs) bash;
+      path = pkgs.lib.makeBinPath [
+        pkgs.coreutils
+        pkgs.gnused
+      ];
+
+      # NixOS-generations -independent
+      installFirmwareBuilder = firmwareInstaller;
+      # NixOS-generations -dependent
+      inherit nixosGenerationsDir nixosGenBuilder;
+    };
+  });
+
+  # Builders used to write during system activation
+
   ubootBuilder = import ./uboot-builder.nix {
     inherit pkgs;
-    ubootPackage = (if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4);
+    ubootPackage = (
+      if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4
+    );
     firmwareBuilder = firmwarePopulateCmd;
     extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
   };
 
-  uefiBuilder = import ./uefi-builder.nix{
+  populateUbootBuilder = import ./uboot-builder.nix {
+    pkgs = pkgs.buildPackages;
+    ubootPackage = (
+      if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4
+    );
+    firmwareBuilder = firmwarePopulateCmd;
+    extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
+  };
+
+  kernelbootBuilder = import ./kernelboot-builder.nix {
     inherit pkgs;
-    uefiPackage = (if (cfg.variant == "5") then pkgs.${namespace}.uefi-rpi5 else pkgs.${namespace}.uefi-rpi4);
+    firmwareBuilder = firmwarePopulateCmd;
+  };
+
+  uefiBuilder = import ./uefi-builder.nix {
+    inherit pkgs;
+    uefiPackage = (
+      if (cfg.variant == "5") then pkgs.${namespace}.uefi-rpi5 else pkgs.${namespace}.uefi-rpi4
+    );
     firmwareBuilder = firmwarePopulateCmd;
   };
 
   # Builders exposed via populateCmd, which run on the build architecture
-  populateFirmwareBuilder = import  ./firmware-builder.nix {
+  populateFirmwareBuilder = import ./firmware-builder.nix {
     pkgs = pkgs.buildPackages;
     configTxt = pkgs.writeTextFile {
       name = "config.txt";
@@ -97,12 +169,9 @@ let
     firmware = pkgs.${namespace}.raspberrypifw;
   };
 
-  populateUbootBuilder = import ./uboot-builder.nix {
-    inherit ubootBinName;
+  populateKernelbootBuilder = import ./kernelboot-builder.nix {
     pkgs = pkgs.buildPackages;
-    ubootPackage = (if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4);
     firmwareBuilder = firmwarePopulateCmd;
-    extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
   };
 
   firmwarePopulateCmd = "${populateFirmwareBuilder} ${firmwareBuilderArgs}";
@@ -114,8 +183,14 @@ let
     # system.build.installBootLoader
     uboot = "${ubootBuilder} -f /boot/firmware -b /boot -c";
     uefi = "${uefiBuilder} -f /boot/firmware -b /boot -c";
+    kernel = builtins.concatStringsSep " " [
+      "${mkBootloader pkgs}"
+      "-g ${toString 10}"
+      "-f /boot/firmware"
+      "-c"
+    ];
   };
-
+  
   # firmware: caller must provide `-c <nixos configuration>` and  `-f <firmware target path>`
   # boot: caller must provide `-c <nixos configuration>` and `-b <boot-dir>`
   populateCmds = {
@@ -123,6 +198,14 @@ let
       firmware = "${populateUbootBuilder}";
       boot = "${populateUbootBuilder}";
     };
+    kernel = let cmd = builtins.concatStringsSep " " [
+      "${mkBootloader pkgs.buildPackages}"
+      "-g ${toString cfg.configurationLimit}"
+    ];
+    in {
+      firmware = "${cmd}";
+      boot = "${cmd}";
+    };
   };
 in
 {
@@ -141,10 +224,11 @@ in
       type = lib.types.enum [
         "uefi"
         "uboot"
+        "kernel"
       ];
       default = "uefi";
     };
-    
+
     apply-overlays-dtmerge = {
       enable = lib.mkEnableOption "" // {
         description = ''
@@ -172,25 +256,33 @@ in
       initrd.availableKernelModules = [
         "usbhid"
         "usb-storage"
-      ] ++ (if (cfg.variant == "5") then [
-        "nvme"
-      ] else
-      [
-        "vc4"
-        "pcie-brcmstb" # required for the pcie bus to work
-        "reset-raspberrypi" # required for vl805 firmware to load
-      ]);
+      ]
+      ++ (
+        if (cfg.variant == "5") then
+          [
+            "nvme"
+          ]
+        else
+          [
+            "vc4"
+            "pcie-brcmstb" # required for the pcie bus to work
+            "reset-raspberrypi" # required for vl805 firmware to load
+          ]
+      );
       loader = {
+        # kernelFile = pkgs.stdenv.hostPlatform.linux-kernel.target;
         generic-extlinux-compatible = {
           enable = lib.mkDefault (if cfg.bootType == "uefi" then false else true);
           useGenerationDeviceTree = lib.mkOverride 60 (if cfg.bootType == "uefi" then false else true);
         };
         systemd-boot.enable = (if cfg.bootType == "uefi" then true else false);
-        systemd-boot.extraInstallCommands = let 
-          bootloaderInstaller = (if cfg.bootType == "uefi" then (builder."uefi") else (builder."uboot")); # todo 
-        in ''
-          ${bootloaderInstaller} -f /boot/firmware -b /boot -c
-        '';
+        systemd-boot.extraInstallCommands =
+          let
+            bootloaderInstaller = (builder."${cfg.bootType}");
+          in
+          ''
+            ${bootloaderInstaller} -f /boot/firmware -b /boot -c
+          '';
         grub.enable = lib.mkForce false;
       };
     };
@@ -224,56 +316,85 @@ in
       ];
     };
 
+    ${namespace}.hardware.raspberry-pi = {
+      config = {
+        all = {
+          options = {
+            os_prefix = lib.mkIf (cfg.bootType == "kernel") {
+              enable = true;
+              value = "${cfg.nixosGenerationsDir}/default/"; # "nixos/<generation-name>/"
+            };
+            kernel = lib.mkIf (cfg.bootType == "kernel" || cfg.bootType == "uboot") {
+              enable = true;
+              value = (if cfg.bootType == "uboot" then "u-boot.bin" else if cfg.bootType == "kernel" then "kernel.img" else "");
+            };
+          };
+        };
+      };
+      extra-config = let
+        # https://www.raspberrypi.com/documentation/computers/config_txt.html#initramfs
+        ramfsfile = "initrd";
+        ramfsaddr = "followkernel"; # same as 0 = "after the kernel image"
+      in ''
+        [all]
+        initramfs ${ramfsfile} ${ramfsaddr}
+      '';
+    };
+
     # Common hardware settings
     hardware = {
       deviceTree = {
         filter = lib.mkDefault (if (cfg.variant == "5") then "bcm2712-rpi-*.dtb" else "bcm2711-rpi-*.dtb");
-        overlays = (if (cfg.variant == "4") then [
-          {
-            name = "rpi4-cpu-revision";
-            dtsText = ''
-              /dts-v1/;
-              /plugin/;
+        overlays = (
+          if (cfg.variant == "4") then
+            [
+              {
+                name = "rpi4-cpu-revision";
+                dtsText = ''
+                  /dts-v1/;
+                  /plugin/;
 
-              / {
-                compatible = "brcm,bcm2711";
+                  / {
+                    compatible = "brcm,bcm2711";
 
-                fragment@0 {
-                  target-path = "/";
-                  __overlay__ {
-                    system {
-                      linux,revision = <0x00d03114>;
+                    fragment@0 {
+                      target-path = "/";
+                      __overlay__ {
+                        system {
+                          linux,revision = <0x00d03114>;
+                        };
+                      };
                     };
                   };
-                };
-              };
-            '';
-          }
-          # {
-          #   name = "enable-xhci";
-          #   dtsText = ''
-          #     /dts-v1/;
-          #     /plugin/;
+                '';
+              }
+              # {
+              #   name = "enable-xhci";
+              #   dtsText = ''
+              #     /dts-v1/;
+              #     /plugin/;
 
-          #     / {
-          #       compatible = "brcm,bcm2711";
-          #       fragment@0 {
-          #         //target-path = "/scb/xhci@7e9c0000";
-          #         target = <&xhci>;
-          #         __overlay__ {
-          #           status = "okay";
-          #         };
-          #       };
-          #     };
-          #   '';
-          # }
-        ] else
-        [
-          {
-            name = "bcm2712d0-overlay";
-            dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/bcm2712d0-overlay.dts";
-          }
-        ]);
+              #     / {
+              #       compatible = "brcm,bcm2711";
+              #       fragment@0 {
+              #         //target-path = "/scb/xhci@7e9c0000";
+              #         target = <&xhci>;
+              #         __overlay__ {
+              #           status = "okay";
+              #         };
+              #       };
+              #     };
+              #   '';
+              # }
+            ]
+          else
+            [
+              # {
+              #   name = "bcm2712d0-overlay";
+              #   dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/bcm2712d0-overlay.dts";
+              # }
+            ]
+        );
       };
       firmware = [ pkgs.${namespace}.raspberryPiWirelessFirmware ];
       graphics.enable32Bit = lib.mkForce false;
@@ -281,7 +402,7 @@ in
     };
 
     system = {
-      #build.installBootLoader = lib.mkOverride 60 (if cfg.bootType == "uefi" then (builder."uefi") else (builder."uboot")); # todo 
+      #build.installBootLoader = lib.mkOverride 60 (if cfg.bootType == "uefi" then (builder."uefi") else (builder."uboot")); # todo
       #boot = {
       #  loader = {
       #    id = lib.mkOverride 60 (if cfg.bootType == "uefi" then "raspberrypi-uefi" else "raspberrypi-uboot"); # todo
@@ -303,12 +424,12 @@ in
     users = {
       users.root.shell = pkgs.zsh;
       extraGroups = {
-        gpio = {};
-        i2c = {};
-        input = {};
-        plugdev = {};
-        spi = {};
-        video = {};
+        gpio = { };
+        i2c = { };
+        input = { };
+        plugdev = { };
+        spi = { };
+        video = { };
       };
     };
 
@@ -316,33 +437,44 @@ in
       udev.packages = [
         pkgs.${namespace}.udev-rules
       ];
-      xserver.extraConfig = let
-        identifier = "rp1";
-        driver = "rp1-vec|rp1-dsi|rp1-dpi";
-      in  ''
-        Section "OutputClass"
-          Identifier "${identifier}"
-          MatchDriver "${driver}"
-          Driver "modesetting"
-          Option "PrimaryGPU" "true"
-        EndSection
-      '';
+      xserver.extraConfig =
+        let
+          identifier = "rp1";
+          driver = "rp1-vec|rp1-dsi|rp1-dpi";
+        in
+        ''
+          Section "OutputClass"
+            Identifier "${identifier}"
+            MatchDriver "${driver}"
+            Driver "modesetting"
+            Option "PrimaryGPU" "true"
+          EndSection
+        '';
     };
 
-    nixpkgs.overlays = [ ] ++ (if cfg.variant == "5" then [
-      (final: prev: {
-        # https://github.com/nvmd/nixos-raspberrypi/issues/64
-        # credit for the initial version of this snippet goes to @micahcc
-        jemalloc = prev.jemalloc.overrideAttrs (old: {
-          # --with-lg-page=(log2 page_size)
-          # RPi5 (bcm2712): since our page size is 16384 (2**14), we need 14
-          configureFlags = let
-            pageSizeFlag = "--with-lg-page";
-          in (prev.lib.filter (flag: prev.lib.hasPrefix pageSizeFlag flag == false) old.configureFlags)
-            ++ [ "${pageSizeFlag}=14" ];
-        });
-      })
-    ] else [ ])
-    ++ (if cfg.apply-overlays-dtmerge.enable then [ dt_ao_overlay ] else [ ]);
+    nixpkgs.overlays =
+      [ ]
+      ++ (
+        if cfg.variant == "5" then
+          [
+            (_final: prev: {
+              # https://github.com/nvmd/nixos-raspberrypi/issues/64
+              # credit for the initial version of this snippet goes to @micahcc
+              jemalloc = prev.jemalloc.overrideAttrs (old: {
+                # --with-lg-page=(log2 page_size)
+                # RPi5 (bcm2712): since our page size is 16384 (2**14), we need 14
+                configureFlags =
+                  let
+                    pageSizeFlag = "--with-lg-page";
+                  in
+                  (prev.lib.filter (flag: prev.lib.hasPrefix pageSizeFlag flag == false) old.configureFlags)
+                  ++ [ "${pageSizeFlag}=14" ];
+              });
+            })
+          ]
+        else
+          [ ]
+      )
+      ++ (if cfg.apply-overlays-dtmerge.enable then [ dt_ao_overlay ] else [ ]);
   };
 }
diff --git a/modules/nixos/hardware/raspberry-pi/firmware-builder.nix b/modules/nixos/hardware/raspberry-pi/firmware-builder.nix
index 515b67d..5f440b7 100644
--- a/modules/nixos/hardware/raspberry-pi/firmware-builder.nix
+++ b/modules/nixos/hardware/raspberry-pi/firmware-builder.nix
@@ -1,6 +1,7 @@
-{ pkgs
-, configTxt
-, firmware ? pkgs.raspberrypifw
+{
+  pkgs,
+  configTxt,
+  firmware ? pkgs.raspberrypifw,
 }:
 
 pkgs.replaceVarsWith {
@@ -15,4 +16,4 @@ pkgs.replaceVarsWith {
 
     inherit firmware configTxt;
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/generational/kernelboot-gen-builder.sh b/modules/nixos/hardware/raspberry-pi/generational/kernelboot-gen-builder.sh
new file mode 100644
index 0000000..b45bbc6
--- /dev/null
+++ b/modules/nixos/hardware/raspberry-pi/generational/kernelboot-gen-builder.sh
@@ -0,0 +1,68 @@
+#! @bash@/bin/sh -e
+
+# shellcheck disable=SC3037,SC3043,SC3044
+
+shopt -s nullglob
+
+export PATH=/empty:@path@
+
+copyForced() {
+    local src="$1"
+    local dst="$2"
+
+    local dstTmp="$dst.tmp.$$"
+
+    cp "$src" "$dstTmp"
+    mv "$dstTmp" "$dst"
+}
+
+# Copy generation's kernel, initrd, cmdline to `genDir`.
+addEntry() {
+    local generationPath="$1"
+    local generationName="$2"
+    local genDir="$3"
+
+    if ! { [ -e "$generationPath/kernel" ] && [ -e "$generationPath/initrd" ]; }; then
+        return
+    fi
+
+    echo -n "kernel..."
+
+    local kernel="$(readlink -f "$generationPath/kernel")"
+    local initrd="$(readlink -f "$generationPath/initrd")"
+
+    readlink -f "$generationPath" > "$genDir/system-link"
+    echo "$kernel" > "$genDir/kernel-link"
+
+    copyForced "$kernel" "$genDir/kernel.img"
+    copyForced "$initrd" "$genDir/initrd"
+    echo "$(cat "$generationPath/kernel-params") init=$generationPath/init" > "$genDir/cmdline.txt"
+
+    echo -n "device tree..."
+
+    @installDeviceTree@ -c "$generationPath" -d "$genDir"
+
+    echo
+}
+
+usage() {
+    echo "usage: $0 -c <path-to-configuration> -n <configuration-name> -d <installation-directory>" >&2
+    exit 1
+}
+
+generationPath=         # Path to nixos configuration/generation
+generationName=         # Name of the generation
+target=/boot/firmware   # Target directory
+
+echo "$0: $@"
+while getopts "c:n:d:" opt; do
+    case "$opt" in
+        c) generationPath="$OPTARG" ;;
+        n) generationName="$OPTARG" ;;
+        d) target="$OPTARG" ;;
+        \?) usage ;;
+    esac
+done
+
+addEntry "$generationPath" "$generationName" "$target"
+echo "kernel boot files installed for nixos generation '$generationName'"
\ No newline at end of file
diff --git a/modules/nixos/hardware/raspberry-pi/i2c.nix b/modules/nixos/hardware/raspberry-pi/i2c.nix
index 590a587..d975b44 100644
--- a/modules/nixos/hardware/raspberry-pi/i2c.nix
+++ b/modules/nixos/hardware/raspberry-pi/i2c.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, namespace, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
 let
   cfg = config.${namespace}.hardware.raspberry-pi.i2c;
   variant = config.${namespace}.hardware.raspberry-pi.variant;
@@ -10,52 +16,62 @@ in
 
   config = lib.mkIf cfg.enable {
     hardware.deviceTree = {
-      overlays = (if (variant == "5") then 
-      [
-        {
-          name = "i2c0-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c0-pi5-overlay.dts";
-        }
-        {
-          name = "i2c1-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c1-pi5-overlay.dts";
-        }
-        {
-          name = "i2c2-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c2-pi5-overlay.dts";
-        }
-        {
-          name = "i2c3-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c3-pi5-overlay.dts";
-        }
-      ]
-      else
-      [
-        {
-          name = "i2c0-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c0-overlay.dts";
-        }
-        {
-          name = "i2c1-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c1-overlay.dts";
-        }
-        {
-          name = "i2c3-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c3-overlay.dts";
-        }
-        {
-          name = "i2c4-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c4-overlay.dts";
-        }
-        {
-          name = "i2c5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c5-overlay.dts";
-        }
-        {
-          name = "i2c6-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c6-overlay.dts";
-        }
-      ]);
+      overlays = (
+        if (variant == "5") then
+          [
+            {
+              name = "i2c0-pi5-overlay";
+              dtsFile = "${
+                pkgs.${namespace}.raspberrypi-overlays
+              }/dtbs/raspberrypi-overlays/i2c0-pi5-overlay.dts";
+            }
+            {
+              name = "i2c1-pi5-overlay";
+              dtsFile = "${
+                pkgs.${namespace}.raspberrypi-overlays
+              }/dtbs/raspberrypi-overlays/i2c1-pi5-overlay.dts";
+            }
+            {
+              name = "i2c2-pi5-overlay";
+              dtsFile = "${
+                pkgs.${namespace}.raspberrypi-overlays
+              }/dtbs/raspberrypi-overlays/i2c2-pi5-overlay.dts";
+            }
+            {
+              name = "i2c3-pi5-overlay";
+              dtsFile = "${
+                pkgs.${namespace}.raspberrypi-overlays
+              }/dtbs/raspberrypi-overlays/i2c3-pi5-overlay.dts";
+            }
+          ]
+        else
+          [
+            {
+              name = "i2c0-overlay";
+              dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c0-overlay.dts";
+            }
+            {
+              name = "i2c1-overlay";
+              dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c1-overlay.dts";
+            }
+            {
+              name = "i2c3-overlay";
+              dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c3-overlay.dts";
+            }
+            {
+              name = "i2c4-overlay";
+              dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c4-overlay.dts";
+            }
+            {
+              name = "i2c5-overlay";
+              dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c5-overlay.dts";
+            }
+            {
+              name = "i2c6-overlay";
+              dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/i2c6-overlay.dts";
+            }
+          ]
+      );
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/kernelboot-builder.nix b/modules/nixos/hardware/raspberry-pi/kernelboot-builder.nix
new file mode 100644
index 0000000..6ba27a6
--- /dev/null
+++ b/modules/nixos/hardware/raspberry-pi/kernelboot-builder.nix
@@ -0,0 +1,19 @@
+{ pkgs
+, firmwareBuilder
+}:
+
+pkgs.replaceVarsWith {
+  src = ./kernelboot-builder.sh;
+  isExecutable = true;
+
+  replacements = {
+    inherit (pkgs) bash;
+    path = pkgs.lib.makeBinPath [
+      pkgs.coreutils
+      pkgs.gnused
+    ];
+
+    inherit firmwareBuilder;
+    copyKernels = true;
+  };
+}
\ No newline at end of file
diff --git a/modules/nixos/hardware/raspberry-pi/kernelboot-builder.sh b/modules/nixos/hardware/raspberry-pi/kernelboot-builder.sh
new file mode 100644
index 0000000..afa1682
--- /dev/null
+++ b/modules/nixos/hardware/raspberry-pi/kernelboot-builder.sh
@@ -0,0 +1,147 @@
+#! @bash@/bin/sh -e
+
+shopt -s nullglob
+
+export PATH=/empty:@path@
+
+# used to track copied files to decide which are obsolete
+# and need to be removed
+declare -A filesCopied
+
+# Convert a path to a file in the Nix store such as
+# /nix/store/<hash>-<name>/file to <hash>-<name>-<file>.
+cleanName() {
+    local path="$1"
+    echo "$path" | sed 's|^/nix/store/||' | sed 's|/|-|g'
+}
+
+# Copy a file from the Nix store to `kernelsDir`.
+copyToKernelsDir() {
+    local src="$1"
+    local kernelsDir="$2"
+
+    local dst="$kernelsDir/$(cleanName $src)"
+    # Don't copy the file if $dst already exists.  This means that we
+    # have to create $dst atomically to prevent partially copied
+    # kernels or initrd if this script is ever interrupted.
+    if ! test -e $dst; then
+        local dstTmp=$dst.tmp.$$
+        cp $src $dstTmp
+        mv $dstTmp $dst
+    fi
+    filesCopied[$dst]=1
+    result=$dst
+}
+
+copyForced() {
+    local src="$1"
+    local dst="$2"
+    cp $src $dst.tmp
+    mv $dst.tmp $dst
+}
+
+# Copy generation's kernel and initrd to `kernelsDir`.
+# Default generation's are also copied to `outdir`
+addEntry() {
+    local generationPath="$1"
+    local generationName="$2"
+    local outdir="$3"
+    local kernelsDir="$4"
+
+    if ! test -e $generationPath/kernel -a -e $generationPath/initrd; then
+        return
+    fi
+
+    local kernel=$(readlink -f $generationPath/kernel)
+    local initrd=$(readlink -f $generationPath/initrd)
+
+    if test "1" = "@copyKernels@"; then
+        copyToKernelsDir $kernel $kernelsDir; kernel=$result
+        copyToKernelsDir $initrd $kernelsDir; initrd=$result
+    fi
+
+    echo $(readlink -f $generationPath) > $kernelsDir/$generationName-system
+    echo $(readlink -f $generationPath/init) > $kernelsDir/$generationName-init
+    cp $generationPath/kernel-params $kernelsDir/$generationName-cmdline.txt
+    echo $initrd > $kernelsDir/$generationName-initrd
+    echo $kernel > $kernelsDir/$generationName-kernel
+
+    if test "$generationName" = "default"; then
+      copyForced $kernel $outdir/kernel.img
+      copyForced $initrd $outdir/initrd
+
+      cp "$(readlink -f "$generationPath/init")" $outdir/nixos-init
+      echo "`cat $generationPath/kernel-params` init=$generationPath/init" >$outdir/cmdline.txt
+    fi
+}
+
+removeObsolete() {
+    local path="$1"
+
+    # Remove obsolete files from $path and $path/old.
+    for fn in $path/*linux* $path/*initrd-initrd*; do
+        if ! test "${filesCopied[$fn]}" = 1; then
+            rm -vf -- "$fn"
+        fi
+    done
+}
+
+addAllEntries() {
+    local defaultGenerationPath="$1"
+    local outdir="$2"
+
+    local kernelsDir="$outdir/nixos-kernels"
+    mkdir -p $kernelsDir || true
+
+    # Add default generation
+    addEntry $defaultGenerationPath default $outdir $kernelsDir
+
+    # Add all generations of the system profile to the menu, in reverse
+    # (most recent to least recent) order.
+    for generation in $(
+        (cd /nix/var/nix/profiles && ls -d system-*-link) \
+        | sed 's/system-\([0-9]\+\)-link/\1/' \
+        | sort -n -r); do
+        link=/nix/var/nix/profiles/system-$generation-link
+        addEntry $link $generation $outdir $kernelsDir
+    done
+
+    removeObsolete $kernelsDir
+}
+
+usage() {
+    echo "usage: $0 -c <path-to-default-configuration> [-d <boot-dir>]" >&2
+    exit 1
+}
+
+
+default=                # Default configuration
+
+echo "kernelboot-builder: $@"
+while getopts "c:b:f:" opt; do
+    case "$opt" in
+        c) default="$OPTARG" ;;
+        b) boottarget="$OPTARG" ;;
+        f) fwtarget="$OPTARG" ;;
+        \?) usage ;;
+    esac
+done
+
+if [ -z "$boottarget" ] && [ -z "$fwtarget" ]; then
+    echo "Error: at least one of \`-b <boot-dir>\` and \`-f <firmware-dir>\` must be set"
+    usage
+fi
+
+if [ -n "$fwtarget" ]; then
+    @firmwareBuilder@ -c $default -d $fwtarget
+
+    echo "updating the boot generations directory..."
+    addAllEntries $default $fwtarget
+fi
+
+if [ -n "$boottarget" ]; then
+    echo "'-b $boottarget' isn't used when loading the kernel directly with kernelboot: \
+          kernels are copied directly to <firmware-dir>"
+fi
+
+echo "kernelboot bootloader installed"
\ No newline at end of file
diff --git a/modules/nixos/hardware/raspberry-pi/leds.nix b/modules/nixos/hardware/raspberry-pi/leds.nix
index 0fc1db6..abded22 100644
--- a/modules/nixos/hardware/raspberry-pi/leds.nix
+++ b/modules/nixos/hardware/raspberry-pi/leds.nix
@@ -1,4 +1,9 @@
-{ config, lib, namespace, ... }:
+{
+  config,
+  lib,
+  namespace,
+  ...
+}:
 
 let
   cfg = config.${namespace}.hardware.raspberry-pi.leds;
@@ -129,4 +134,4 @@ in
       };
     })
   ];
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/modesetting.nix b/modules/nixos/hardware/raspberry-pi/modesetting.nix
index e8f6992..3bc4a88 100644
--- a/modules/nixos/hardware/raspberry-pi/modesetting.nix
+++ b/modules/nixos/hardware/raspberry-pi/modesetting.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, namespace, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
 let
   cfg = config.${namespace}.hardware.raspberry-pi.modesetting;
   variant = config.${namespace}.hardware.raspberry-pi.variant;
@@ -10,26 +16,28 @@ in
 
   config = lib.mkIf cfg.enable {
     hardware.deviceTree = {
-      overlays = 
-      [
-        {
-          name = "vc4-fkms-v3d-pi4-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/vc4-fkms-v3d-pi4-overlay.dts";
-        }
-      ] ++ (if (variant == "5") then 
-      [
-        {
-          name = "vc4-kms-v3d-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/vc4-kms-v3d-pi5-overlay.dts";
-        }
-      ]
-      else
-      [
-        {
-          name = "vc4-kms-v3d-pi4-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/vc4-kms-v3d-pi4-overlay.dts";
-        }
-      ]);
+      overlays =
+        [ ]
+        ++ (
+          if (variant == "5") then
+            [
+              {
+                name = "vc4-kms-v3d-pi5-overlay";
+                dtsFile = "${
+                  pkgs.${namespace}.raspberrypi-overlays
+                }/dtbs/raspberrypi-overlays/vc4-kms-v3d-pi5-overlay.dts";
+              }
+            ]
+          else
+            [
+              {
+                name = "vc4-fkms-v3d-pi4-overlay";
+                dtsFile = "${
+                  pkgs.${namespace}.raspberrypi-overlays
+                }/dtbs/raspberrypi-overlays/vc4-fkms-v3d-pi4-overlay.dts";
+              }
+            ]
+        );
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/pwm.nix b/modules/nixos/hardware/raspberry-pi/pwm.nix
index 7c5e40e..7191338 100644
--- a/modules/nixos/hardware/raspberry-pi/pwm.nix
+++ b/modules/nixos/hardware/raspberry-pi/pwm.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, namespace, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
 let
   cfg = config.${namespace}.hardware.raspberry-pi.pwm;
   variant = config.${namespace}.hardware.raspberry-pi.variant;
@@ -15,12 +21,13 @@ in
           name = "enable-pwm";
           filter = (if (variant == "5") then "*pi5*" else "*rpi-4-b*");
           dtsFile = (
-            if (variant == "5") 
-            then "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm-pio-overlay.dts" 
-            else "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm1-overlay.dts"
+            if (variant == "5") then
+              "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm-pio-overlay.dts"
+            else
+              "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pwm1-overlay.dts"
           );
         }
       ];
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/uboot-builder.nix b/modules/nixos/hardware/raspberry-pi/uboot-builder.nix
index 2b7264c..29a6bcc 100644
--- a/modules/nixos/hardware/raspberry-pi/uboot-builder.nix
+++ b/modules/nixos/hardware/raspberry-pi/uboot-builder.nix
@@ -1,8 +1,9 @@
-{ pkgs
-, ubootPackage
-, ubootBinName ? "u-boot.bin"
-, extlinuxConfBuilder
-, firmwareBuilder
+{
+  pkgs,
+  ubootPackage,
+  ubootBinName ? "u-boot.bin",
+  extlinuxConfBuilder,
+  firmwareBuilder,
 }:
 
 pkgs.replaceVarsWith {
@@ -20,4 +21,4 @@ pkgs.replaceVarsWith {
     inherit extlinuxConfBuilder;
     inherit firmwareBuilder;
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/uefi-builder.nix b/modules/nixos/hardware/raspberry-pi/uefi-builder.nix
index 0badac0..5131658 100644
--- a/modules/nixos/hardware/raspberry-pi/uefi-builder.nix
+++ b/modules/nixos/hardware/raspberry-pi/uefi-builder.nix
@@ -1,6 +1,7 @@
-{ pkgs
-, uefiPackage
-, firmwareBuilder
+{
+  pkgs,
+  uefiPackage,
+  firmwareBuilder,
 }:
 
 pkgs.replaceVarsWith {
@@ -16,4 +17,4 @@ pkgs.replaceVarsWith {
     uefi = uefiPackage;
     inherit firmwareBuilder;
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/hardware/raspberry-pi/uefi-builder.sh b/modules/nixos/hardware/raspberry-pi/uefi-builder.sh
index 79fab2f..491fe5e 100644
--- a/modules/nixos/hardware/raspberry-pi/uefi-builder.sh
+++ b/modules/nixos/hardware/raspberry-pi/uefi-builder.sh
@@ -42,7 +42,7 @@ if [ -n "$fwtarget" ]; then
     @firmwareBuilder@ -c $default -d $fwtarget
 
     echo "copying uefi firmware..."
-    rm -rf $fwtarget/*
+    # rm -rf $fwtarget/*
     copyForced @uefi@ $fwtarget/
 fi
 
diff --git a/modules/nixos/hardware/raspberry-pi/wifi.nix b/modules/nixos/hardware/raspberry-pi/wifi.nix
index 6195de3..fa20a87 100644
--- a/modules/nixos/hardware/raspberry-pi/wifi.nix
+++ b/modules/nixos/hardware/raspberry-pi/wifi.nix
@@ -1,4 +1,10 @@
-{ config, lib, pkgs, namespace, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  namespace,
+  ...
+}:
 let
   cfg = config.${namespace}.hardware.raspberry-pi.disable-wifi;
   variant = config.${namespace}.hardware.raspberry-pi.variant;
@@ -10,25 +16,32 @@ in
 
   config = lib.mkIf cfg.enable {
     hardware.deviceTree = {
-      overlays = 
-      [ ] ++ (if (variant == "5") then 
-      [
-        {
-          name = "disable-wifi-pi5-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/disable-wifi-pi5-overlay.dts";
-        }
-      ]
-      else
-      [
-        {
-          name = "disable-wifi-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/disable-wifi-overlay.dts";
-        }
-        {
-          name = "wifimac-overlay";
-          dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/wifimac-overlay.dts";
-        }
-      ]);
+      overlays =
+        [ ]
+        ++ (
+          if (variant == "5") then
+            [
+              {
+                name = "disable-wifi-pi5-overlay";
+                dtsFile = "${
+                  pkgs.${namespace}.raspberrypi-overlays
+                }/dtbs/raspberrypi-overlays/disable-wifi-pi5-overlay.dts";
+              }
+            ]
+          else
+            [
+              {
+                name = "disable-wifi-overlay";
+                dtsFile = "${
+                  pkgs.${namespace}.raspberrypi-overlays
+                }/dtbs/raspberrypi-overlays/disable-wifi-overlay.dts";
+              }
+              {
+                name = "wifimac-overlay";
+                dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/wifimac-overlay.dts";
+              }
+            ]
+        );
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix
index 60e75b4..3bc0dee 100644
--- a/modules/nixos/nix/default.nix
+++ b/modules/nixos/nix/default.nix
@@ -1,13 +1,9 @@
 {
   config,
   lib,
-  pkgs,
   namespace,
   ...
 }:
-let
-  gpuTargets = [ "gfx1102" ]; # todo update when support is added gfx1150
-in
 {
   programs.ccache = {
     enable = true;
@@ -59,42 +55,86 @@ in
 
   nixpkgs.overlays = [
     (_self: super: {
-       ${namespace} = 
+      ${namespace} =
         let
-          clangCcacheStdenv = super.overrideCC super.llvmPackages.stdenv (super.ccacheWrapper.override {
-            cc = super.llvmPackages.stdenv.cc;
-            extraConfig = ''
-              export CCACHE_SLOPPINESS=include_file_ctime,time_macros
-              export CCACHE_DIR=/var/cache/ccache
-            '';
-          });
+          clangCcacheStdenv = super.overrideCC super.llvmPackages.stdenv (
+            super.ccacheWrapper.override {
+              cc = super.llvmPackages.stdenv.cc;
+              extraConfig = ''
+                export CCACHE_SLOPPINESS=include_file_ctime,time_macros
+                export CCACHE_DIR=/var/cache/ccache
+              '';
+            }
+          );
         in
-         super.${namespace} // {
-          linuxPackages_rpi5 = super.linuxPackagesFor (super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; });
-          linuxPackages_rpi4 = super.linuxPackagesFor (super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; rpiVersion = 4; });
+        super.${namespace}
+        // {
+          linuxPackages_rpi5 = super.linuxPackagesFor (
+            super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; }
+          );
+          linuxPackages_rpi4 = super.linuxPackagesFor (
+            super.${namespace}.linux-rpi.override {
+              stdenv = super.ccacheStdenv;
+              rpiVersion = 4;
+            }
+          );
           libraspberrypi = super.${namespace}.libraspberrypi.override { stdenv = super.ccacheStdenv; };
           raspberrypi-utils = super.${namespace}.raspberrypi-utils.override { stdenv = super.ccacheStdenv; };
-     
-          linuxPackages_cachyos = super.${namespace}.linuxPackages_cachyos.override { stdenv = super.ccacheStdenv; };
-          linuxPackages_cachyos-lto = super.${namespace}.linuxPackages_cachyos-lto.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-lto-full = super.${namespace}.linuxPackages_cachyos-lto-full.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-lts = super.${namespace}.linuxPackages_cachyos-lts.override { stdenv = super.ccacheStdenv; };
-          linuxPackages_cachyos-lts-lto = super.${namespace}.linuxPackages_cachyos-lts-lto.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-lto-znver4 = super.${namespace}.linuxPackages_cachyos-lto-znver4.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-server = super.${namespace}.linuxPackages_cachyos-server.override { stdenv = super.ccacheStdenv; };
-          linuxPackages_cachyos-server-lto = super.${namespace}.linuxPackages_cachyos-server-lto.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-server-lto-znver4 = super.${namespace}.linuxPackages_cachyos-server-lto-znver4.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-rc = super.${namespace}.linuxPackages_cachyos-rc.override { stdenv = super.ccacheStdenv; };
-          linuxPackages_cachyos-rc-lto = super.${namespace}.linuxPackages_cachyos-rc-lto.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-rc-lto-znver4 = super.${namespace}.linuxPackages_cachyos-rc-lto-znver4.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-hardened = super.${namespace}.linuxPackages_cachyos-hardened.override { stdenv = super.ccacheStdenv; };
-          linuxPackages_cachyos-hardened-lto = super.${namespace}.linuxPackages_cachyos-hardened-lto.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-hardened-lto-znver4 = super.${namespace}.linuxPackages_cachyos-hardened-lto-znver4.override { stdenv = clangCcacheStdenv; };
-          linuxPackages_cachyos-deckify = super.${namespace}.linuxPackages_cachyos-deckify.override { stdenv = super.ccacheStdenv; };
-          linuxPackages_cachyos-deckify-lto = super.${namespace}.linuxPackages_cachyos-deckify-lto.override { stdenv = clangCcacheStdenv; };
-       };
+
+          linuxPackages_cachyos = super.${namespace}.linuxPackages_cachyos.override {
+            stdenv = super.ccacheStdenv;
+          };
+          linuxPackages_cachyos-lto = super.${namespace}.linuxPackages_cachyos-lto.override {
+            stdenv = clangCcacheStdenv;
+          };
+          linuxPackages_cachyos-lto-full = super.${namespace}.linuxPackages_cachyos-lto-full.override {
+            stdenv = clangCcacheStdenv;
+          };
+          linuxPackages_cachyos-lts = super.${namespace}.linuxPackages_cachyos-lts.override {
+            stdenv = super.ccacheStdenv;
+          };
+          linuxPackages_cachyos-lts-lto = super.${namespace}.linuxPackages_cachyos-lts-lto.override {
+            stdenv = clangCcacheStdenv;
+          };
+          linuxPackages_cachyos-lto-znver4 = super.${namespace}.linuxPackages_cachyos-lto-znver4.override {
+            stdenv = clangCcacheStdenv;
+          };
+          linuxPackages_cachyos-server = super.${namespace}.linuxPackages_cachyos-server.override {
+            stdenv = super.ccacheStdenv;
+          };
+          linuxPackages_cachyos-server-lto = super.${namespace}.linuxPackages_cachyos-server-lto.override {
+            stdenv = clangCcacheStdenv;
+          };
+          linuxPackages_cachyos-server-lto-znver4 =
+            super.${namespace}.linuxPackages_cachyos-server-lto-znver4.override
+              { stdenv = clangCcacheStdenv; };
+          linuxPackages_cachyos-rc = super.${namespace}.linuxPackages_cachyos-rc.override {
+            stdenv = super.ccacheStdenv;
+          };
+          linuxPackages_cachyos-rc-lto = super.${namespace}.linuxPackages_cachyos-rc-lto.override {
+            stdenv = clangCcacheStdenv;
+          };
+          linuxPackages_cachyos-rc-lto-znver4 =
+            super.${namespace}.linuxPackages_cachyos-rc-lto-znver4.override
+              { stdenv = clangCcacheStdenv; };
+          linuxPackages_cachyos-hardened = super.${namespace}.linuxPackages_cachyos-hardened.override {
+            stdenv = super.ccacheStdenv;
+          };
+          linuxPackages_cachyos-hardened-lto =
+            super.${namespace}.linuxPackages_cachyos-hardened-lto.override
+              { stdenv = clangCcacheStdenv; };
+          linuxPackages_cachyos-hardened-lto-znver4 =
+            super.${namespace}.linuxPackages_cachyos-hardened-lto-znver4.override
+              { stdenv = clangCcacheStdenv; };
+          linuxPackages_cachyos-deckify = super.${namespace}.linuxPackages_cachyos-deckify.override {
+            stdenv = super.ccacheStdenv;
+          };
+          linuxPackages_cachyos-deckify-lto = super.${namespace}.linuxPackages_cachyos-deckify-lto.override {
+            stdenv = clangCcacheStdenv;
+          };
+        };
     })
-    
+
     (_self: super: {
       "raspberrypi-utils" = super.${namespace}."raspberrypi-utils";
       "raspberrypi-udev-rules" = super.${namespace}."udev-rules";
@@ -173,7 +213,7 @@ in
         qt3d = super.kdePackages.qt3d.override {
           qtbase = super.kdePackages.qtbase.override { stdenv = super.ccacheStdenv; };
         };
-        qtwebengine = super.stable.kdePackages.qtwebengine; #.override { stdenv = super.ccacheStdenv; };
+        qtwebengine = super.stable.kdePackages.qtwebengine; # .override { stdenv = super.ccacheStdenv; };
       };
     })
     # (_self: super: {
diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index b0c0741..c5955e7 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -9,10 +9,17 @@ with lib;
 let
   inherit (lib.${namespace}) mkOpt mkBoolOpt;
   cfg = config.${namespace}.user // {
-    hashedPasswordFile = (if (config.${namespace}.user.hashedPassword == null && 
-        config.${namespace}.user.hashedPasswordFile == null && 
-        config.${namespace}.user.password == null) then 
-        defaultPasswordFile else null
+    hashedPasswordFile = (
+      if
+        (
+          config.${namespace}.user.hashedPassword == null
+          && config.${namespace}.user.hashedPasswordFile == null
+          && config.${namespace}.user.password == null
+        )
+      then
+        defaultPasswordFile
+      else
+        config.${namespace}.user.hashedPasswordFile
     );
   };
 
diff --git a/overlays/linux-cachyos/default.nix b/overlays/linux-cachyos/default.nix
index 11ab7e8..f1c1f6d 100644
--- a/overlays/linux-cachyos/default.nix
+++ b/overlays/linux-cachyos/default.nix
@@ -1,4 +1,9 @@
-{ inputs, self, namespace, ... }:
+{
+  inputs,
+  self,
+  namespace,
+  ...
+}:
 
 final: prev:
 let
diff --git a/packages/linux-cachyos/default.nix b/packages/linux-cachyos/default.nix
index c49dd37..56a01de 100644
--- a/packages/linux-cachyos/default.nix
+++ b/packages/linux-cachyos/default.nix
@@ -69,11 +69,6 @@ let
     description = "Linux EEVDF-BORE scheduler Kernel by CachyOS built with LLVM and Thin LTO";
   };
 
-  ltoFullKernelAttrs = ltoKernelAttrs // {
-    configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
-    useLTO = "full";
-  };
-
   serverLtoKernelAttrs = ltoKernelAttrs // {
     taste = "linux-cachyos-server";
     pname = "cachyos-server-lto";
@@ -211,39 +206,58 @@ in
   cachyos-gcc = mkCachyKernel gccKernelAttrs;
 
   # GCC LTS
-  cachyos-lts = mkCachyKernel (gccKernelAttrs // ltsAttrs // {
-    taste = "linux-cachyos-lts";
-    pname = "cachyos-lts";
-    configPath = ./config-nix/${arch}-linux/cachyos-lts.${arch}-linux.nix;
-  });
+  cachyos-lts = mkCachyKernel (
+    gccKernelAttrs
+    // ltsAttrs
+    // {
+      taste = "linux-cachyos-lts";
+      pname = "cachyos-lts";
+      configPath = ./config-nix/${arch}-linux/cachyos-lts.${arch}-linux.nix;
+    }
+  );
 
   # GCC RC
-  cachyos-rc = mkCachyKernel (gccKernelAttrs // rcAttrs // {
-    taste = "linux-cachyos-rc";
-    pname = "cachyos-rc";
-    configPath = ./config-nix/${arch}-linux/cachyos-rc.${arch}-linux.nix;
-  });
+  cachyos-rc = mkCachyKernel (
+    gccKernelAttrs
+    // rcAttrs
+    // {
+      taste = "linux-cachyos-rc";
+      pname = "cachyos-rc";
+      configPath = ./config-nix/${arch}-linux/cachyos-rc.${arch}-linux.nix;
+    }
+  );
 
   # Server GCC
-  cachyos-server = mkCachyKernel (gccKernelAttrs // serverAttrs // {
-    taste = "linux-cachyos-server";
-    pname = "cachyos-server";
-    configPath = ./config-nix/${arch}-linux/cachyos-server.${arch}-linux.nix;
-  });
+  cachyos-server = mkCachyKernel (
+    gccKernelAttrs
+    // serverAttrs
+    // {
+      taste = "linux-cachyos-server";
+      pname = "cachyos-server";
+      configPath = ./config-nix/${arch}-linux/cachyos-server.${arch}-linux.nix;
+    }
+  );
 
   # Hardened GCC
-  cachyos-hardened = mkCachyKernel (gccKernelAttrs // hardenedAttrs // {
-    taste = "linux-cachyos-hardened";
-    pname = "cachyos-hardened";
-    configPath = ./config-nix/${arch}-linux/cachyos-hardened.${arch}-linux.nix;
-  });
+  cachyos-hardened = mkCachyKernel (
+    gccKernelAttrs
+    // hardenedAttrs
+    // {
+      taste = "linux-cachyos-hardened";
+      pname = "cachyos-hardened";
+      configPath = ./config-nix/${arch}-linux/cachyos-hardened.${arch}-linux.nix;
+    }
+  );
 
   # Deckify GCC
-  cachyos-deckify = mkCachyKernel (gccKernelAttrs // {
-    taste = "linux-cachyos-deckify";
-    pname = "cachyos-deckify";
-    configPath = ./config-nix/${arch}-linux/cachyos-deckify.${arch}-linux.nix;
-  });
+  cachyos-deckify = mkCachyKernel (
+    gccKernelAttrs
+    // {
+      taste = "linux-cachyos-deckify";
+      pname = "cachyos-deckify";
+      configPath = ./config-nix/${arch}-linux/cachyos-deckify.${arch}-linux.nix;
+    }
+  );
 
   # ######################################################
   #                      LTO Kernels                     #
@@ -253,24 +267,28 @@ in
   cachyos-lto = mkCachyKernel ltoKernelAttrs;
 
   # LTO Full
-  cachyos-lto-full = mkCachyKernel (ltoKernelAttrs // {
-    configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
-    useLTO = "full";
-  });
+  cachyos-lto-full = mkCachyKernel (
+    ltoKernelAttrs
+    // {
+      configPath = ./config-nix/cachyos-lto.x86_64-linux.nix;
+      useLTO = "full";
+    }
+  );
 
   # LTO Zen Version 4
   cachyos-lto-znver4 = mkCachyKernel (
     ltoKernelAttrs
     // {
       pname = "cachyos-lto-znver4";
-    configPath = ./config-nix/${arch}-linux/cachyos-znver4.${arch}-linux.nix;
+      configPath = ./config-nix/${arch}-linux/cachyos-znver4.${arch}-linux.nix;
     }
   );
 
   # LTS LTO
   cachyos-lts-lto = mkCachyKernel (
     ltoKernelAttrs
-    // ltsAttrs // {
+    // ltsAttrs
+    // {
       taste = "linux-cachyos-lts";
       pname = "cachyos-lts-lto";
       configPath = ./config-nix/${arch}-linux/cachyos-lts-lto.${arch}-linux.nix;
@@ -280,7 +298,8 @@ in
   # Hardened LTO
   cachyos-hardened-lto = mkCachyKernel (
     ltoKernelAttrs
-    // hardenedAttrs // {
+    // hardenedAttrs
+    // {
       taste = "linux-cachyos-hardened";
       pname = "cachyos-hardened-lto";
       configPath = ./config-nix/${arch}-linux/cachyos-hardened-lto.${arch}-linux.nix;
@@ -290,7 +309,8 @@ in
   # RC LTO
   cachyos-rc-lto = mkCachyKernel (
     ltoKernelAttrs
-    // rcAttrs // {
+    // rcAttrs
+    // {
       taste = "linux-cachyos-rc";
       pname = "cachyos-rc-lto";
       configPath = ./config-nix/${arch}-linux/cachyos-rc-lto.${arch}-linux.nix;
@@ -300,7 +320,8 @@ in
   # RC LTO Zen Version 4
   cachyos-rc-lto-znver4 = mkCachyKernel (
     ltoKernelAttrs
-    // rcAttrs // {
+    // rcAttrs
+    // {
       taste = "linux-cachyos-rc";
       pname = "cachyos-rc-lto-znver4";
       configPath = ./config-nix/${arch}-linux/cachyos-rc-lto-znver4.${arch}-linux.nix;
@@ -308,11 +329,15 @@ in
   );
 
   # Server LTO
-  cachyos-server-lto = mkCachyKernel (ltoKernelAttrs // serverAttrs // {
-    taste = "linux-cachyos-server";
-    pname = "cachyos-server-lto";
-    configPath = ./config-nix/${arch}-linux/cachyos-server-lto.${arch}-linux.nix;
-  });
+  cachyos-server-lto = mkCachyKernel (
+    ltoKernelAttrs
+    // serverAttrs
+    // {
+      taste = "linux-cachyos-server";
+      pname = "cachyos-server-lto";
+      configPath = ./config-nix/${arch}-linux/cachyos-server-lto.${arch}-linux.nix;
+    }
+  );
 
   # Server LTO Zen Version 4
   cachyos-server-lto-znver4 = mkCachyKernel (
@@ -324,10 +349,13 @@ in
   );
 
   # Deckify LTO
-  cachyos-deckify-lto = mkCachyKernel (ltoKernelAttrs // {
-    pname = "linux-cachyos-deckify-lto";
-    configPath = ./config-nix/${arch}-linux/cachyos-deckify-lto.${arch}-linux.nix;
-  });
+  cachyos-deckify-lto = mkCachyKernel (
+    ltoKernelAttrs
+    // {
+      pname = "linux-cachyos-deckify-lto";
+      configPath = ./config-nix/${arch}-linux/cachyos-deckify-lto.${arch}-linux.nix;
+    }
+  );
 
   # ######################################################
   #                       Cachy ZFZ                      #
diff --git a/packages/linux-cachyos/prepare.nix b/packages/linux-cachyos/prepare.nix
index d11a2ff..c0d72ed 100644
--- a/packages/linux-cachyos/prepare.nix
+++ b/packages/linux-cachyos/prepare.nix
@@ -344,7 +344,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = ogKernelConfigfile.meta // {
     # at the time of this writing, they don't have config files for aarch64
-    platforms = [ "x86_64-linux" "aarch64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
   };
 
   passthru = {
diff --git a/packages/raspberrypi/ffmpeg-rpi/default.nix b/packages/raspberrypi/ffmpeg-rpi/default.nix
index db2e7b7..8387689 100644
--- a/packages/raspberrypi/ffmpeg-rpi/default.nix
+++ b/packages/raspberrypi/ffmpeg-rpi/default.nix
@@ -9,7 +9,6 @@
   udev,
   systemd,
   withVoutDrm ? true,
-  stdenv ? null,
 }:
 
 let
diff --git a/packages/raspberrypi/linux-rpi/default.nix b/packages/raspberrypi/linux-rpi/default.nix
index ca3da41..87eaa7c 100644
--- a/packages/raspberrypi/linux-rpi/default.nix
+++ b/packages/raspberrypi/linux-rpi/default.nix
@@ -14,9 +14,9 @@ let
   tag = "stable_20250916";
   hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";
   # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
-#  modDirVersion = "6.18.1";
-#  tag = "unstable_20251226";
-#  hash = "sha256-VYrXqwK9P2nWkm3DhOU8qaXzWv5L0DUoJ2MBRF6PoEE=";
+  #  modDirVersion = "6.18.1";
+  #  tag = "unstable_20251226";
+  #  hash = "sha256-VYrXqwK9P2nWkm3DhOU8qaXzWv5L0DUoJ2MBRF6PoEE=";
 in
 lib.overrideDerivation
   (buildLinux (
@@ -70,7 +70,7 @@ lib.overrideDerivation
     }
     // (args.argsOverride or { })
   ))
-  (oldAttrs: {
+  (_oldAttrs: {
     postConfigure = ''
       # The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
       sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
diff --git a/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix b/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix
index fd11eb3..c880465 100644
--- a/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix
+++ b/packages/raspberrypi/raspberryPiWirelessFirmware/default.nix
@@ -60,4 +60,4 @@ stdenvNoCC.mkDerivation {
     platforms = platforms.linux;
     maintainers = with maintainers; [ lopsided98 ];
   };
-}
\ No newline at end of file
+}
diff --git a/packages/raspberrypi/raspberrypi-overlays/default.nix b/packages/raspberrypi/raspberrypi-overlays/default.nix
index d07d9b1..b5e7366 100644
--- a/packages/raspberrypi/raspberrypi-overlays/default.nix
+++ b/packages/raspberrypi/raspberrypi-overlays/default.nix
@@ -33,4 +33,4 @@ stdenvNoCC.mkDerivation rec {
     # Maybe due to https://github.com/NixOS/nix/issues/847
     broken = stdenvNoCC.hostPlatform.isDarwin;
   };
-}
\ No newline at end of file
+}
diff --git a/packages/raspberrypi/raspberrypifw/default.nix b/packages/raspberrypi/raspberrypifw/default.nix
index 753e351..c668bee 100644
--- a/packages/raspberrypi/raspberrypifw/default.nix
+++ b/packages/raspberrypi/raspberrypifw/default.nix
@@ -34,4 +34,4 @@ stdenvNoCC.mkDerivation rec {
     # Maybe due to https://github.com/NixOS/nix/issues/847
     broken = stdenvNoCC.hostPlatform.isDarwin;
   };
-}
\ No newline at end of file
+}
diff --git a/packages/raspberrypi/uefi-rpi4/default.nix b/packages/raspberrypi/uefi-rpi4/default.nix
index 0132030..4f5ad7f 100644
--- a/packages/raspberrypi/uefi-rpi4/default.nix
+++ b/packages/raspberrypi/uefi-rpi4/default.nix
@@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation rec {
   pname = "uefi-rpi4";
   version = "1.50";
 
-  src= fetchzip {
+  src = fetchzip {
     url = "https://github.com/pftf/RPi4/releases/download/v${version}/RPi4_UEFI_Firmware_v${version}.zip";
     stripRoot = false;
     hash = "sha256-g8046/Ox0hZgvU6u3ZfC6HMqoTME0Y7NsZD6NvUsp7w=";
diff --git a/packages/raspberrypi/uefi-rpi5/default.nix b/packages/raspberrypi/uefi-rpi5/default.nix
index 08ab676..013b0fc 100644
--- a/packages/raspberrypi/uefi-rpi5/default.nix
+++ b/packages/raspberrypi/uefi-rpi5/default.nix
@@ -1,38 +1,56 @@
 {
   lib,
   stdenvNoCC,
-  fetchzip,
+  fetchurl,
 }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "uefi-rpi5";
-  version = "0.3";
+  version = "test1";
 
-  src= fetchzip {
-    url = "https://github.com/worproject/rpi5-uefi/releases/download/v${version}/RPi5_UEFI_Release_v${version}.zip";
-    stripRoot = false;
-    hash = "sha256-bjEvq7KlEFANnFVL0LyexXEeoXj7rHGnwQpq09PhIb0=";
+  src = fetchurl {
+    url = "https://github.com/NumberOneGit/rpi5-uefi/releases/download/${version}/RPI_EFI.fd";
+    hash = "sha256-GIgru10KCol9PXcdgR2d1BHf2In07OQ2P1kru7GUupY=";
   };
 
   sourceRoot = ".";
 
+  dontUnpack = true;
+
   dontBuild = true;
   # Firmware blobs do not need fixing and should not be modified
   dontFixup = true;
 
   installPhase = ''
     runHook preInstall
-    mkdir -p "$out/firmware"
+    mkdir -p "$out"
 
-    cp -rv "${src}" "$out/firmware"
+    cp -rv "$src" "$out"
+    cat > "$out/config.txt" <<'EOF'
+      armstub=RPI_EFI.fd
+      device_tree_address=0x3e0000
+      device_tree_end=0x400000
+
+      # Force 32 bpp framebuffer allocation.
+      framebuffer_depth=32
+
+      # Disable compensation for displays with overscan.
+      disable_overscan=1
+
+      # Force maximum USB power regardless of the power supply.
+      usb_max_current_enable=1
+
+      # Force maximum CPU speed.
+      force_turbo=1
+      EOF
 
     runHook postInstall
   '';
 
   meta = with lib; {
     description = "RPI5 UEFI firmware";
-    homepage = "https://github.com/pftf/RPi4";
+    homepage = "https://github.com/NumberOneGit/rpi5-uefi";
     platforms = platforms.linux;
     maintainers = with maintainers; [ ];
   };
-}
\ No newline at end of file
+}
diff --git a/packages/uboot/default.nix b/packages/uboot/default.nix
index 992b84a..11d2d56 100644
--- a/packages/uboot/default.nix
+++ b/packages/uboot/default.nix
@@ -1,33 +1,18 @@
 {
-  stdenv,
   lib,
   bc,
   bison,
-  dtc,
-  fetchFromGitHub,
-  fetchpatch,
   fetchurl,
   flex,
   gnutls,
   installShellFiles,
   libuuid,
-  meson-tools,
   ncurses,
   openssl,
-  rkbin,
   swig,
   which,
   python3,
   perl,
-  armTrustedFirmwareAllwinner,
-  armTrustedFirmwareAllwinnerH6,
-  armTrustedFirmwareAllwinnerH616,
-  armTrustedFirmwareRK3328,
-  armTrustedFirmwareRK3399,
-  armTrustedFirmwareRK3568,
-  armTrustedFirmwareRK3588,
-  armTrustedFirmwareS905,
-  opensbi,
   buildPackages,
   callPackages,
   darwin,
@@ -57,7 +42,6 @@ let
       pythonScriptsToInstall ? { },
       installDir ? "$out",
       defconfig,
-      extraConfig ? "",
       extraPatches ? [ ],
       extraMakeFlags ? [ ],
       extraMeta ? { },
@@ -272,4 +256,4 @@ in
     extraMeta.platforms = [ "aarch64-linux" ];
     filesToInstall = [ "u-boot.bin" ];
   };
-}
\ No newline at end of file
+}
diff --git a/packages/uboot/python.nix b/packages/uboot/python.nix
index 9bd7f7f..dc81ec0 100644
--- a/packages/uboot/python.nix
+++ b/packages/uboot/python.nix
@@ -157,4 +157,4 @@ rec {
       ];
   };
 
-}
\ No newline at end of file
+}
diff --git a/qemu.nix b/qemu.nix
index a5d48a3..38e1ee1 100644
--- a/qemu.nix
+++ b/qemu.nix
@@ -1,4 +1,6 @@
-{ pkgs ? import <nixpkgs> {} }:
+{
+  pkgs ? import <nixpkgs> { },
+}:
 
 pkgs.writeShellApplication {
   name = "test-image";
@@ -64,4 +66,4 @@ pkgs.writeShellApplication {
       "''\${pflash_vars[@]}" \
       -drive "if=virtio,format=raw,file=$tmpFile"
   '';
-}
\ No newline at end of file
+}
diff --git a/systems/aarch64-linux/pi4/boot.nix b/systems/aarch64-linux/pi4/boot.nix
index ddff8e0..8575041 100755
--- a/systems/aarch64-linux/pi4/boot.nix
+++ b/systems/aarch64-linux/pi4/boot.nix
@@ -4,16 +4,13 @@
   namespace,
   ...
 }:
-let
-  # kernelBundle = pkgs.linuxAndFirmware.latest;
-in
 {
   boot = {
-  #   loader.raspberry-pi = {
-  #     firmwarePackage = kernelBundle.raspberrypifw;
-  #     variant = "4";
-  #   };
-  #   kernelPackages = kernelBundle.linuxPackages_rpi4;
+    #   loader.raspberry-pi = {
+    #     firmwarePackage = kernelBundle.raspberrypifw;
+    #     variant = "4";
+    #   };
+    #   kernelPackages = kernelBundle.linuxPackages_rpi4;
     # kernelPackages = pkgs.${namespace}.linuxPackages_cachyos-lto;
     kernelPackages = pkgs.linuxPackages_latest;
     supportedFilesystems = lib.mkForce [ ];
diff --git a/systems/aarch64-linux/pi5/boot.nix b/systems/aarch64-linux/pi5/boot.nix
index 9baef21..659a825 100755
--- a/systems/aarch64-linux/pi5/boot.nix
+++ b/systems/aarch64-linux/pi5/boot.nix
@@ -1,38 +1,43 @@
-{ pkgs, lib, namespace, ... }:
-let
-  # kernelBundle = pkgs.linuxAndFirmware.latest;
-in
+{
+  pkgs,
+  lib,
+  namespace,
+  ...
+}:
 {
   boot = {
     # loader.raspberry-pi = {
     #   bootloader = "kernel";
     #   firmwarePackage = pkgs.raspberrypifw;
     # };
-    kernelPackages = pkgs.${namespace}.linuxPackages_rpi5;
+    kernelPackages = pkgs.linuxPackages_latest;
     supportedFilesystems = lib.mkForce [ ];
   };
 
   ${namespace}.hardware.raspberry-pi.config = {
+    # extra-config = {
+    #   armstub = "RPI_EFI.fd";
+    # };
     all = {
-      # [all] conditional filter, https://www.raspberrypi.com/documentation/computers/config_txt.html#conditional-filters
+      #   # [all] conditional filter, https://www.raspberrypi.com/documentation/computers/config_txt.html#conditional-filters
 
-      options = {
-        # https://www.raspberrypi.com/documentation/computers/config_txt.html#enable_uart
-        # in conjunction with `console=serial0,115200` in kernel command line (`cmdline.txt`)
-        # creates a serial console, accessible using GPIOs 14 and 15 (pins
-        #  8 and 10 on the 40-pin header)
-        enable_uart = {
-          enable = true;
-          value = true;
-        };
-        # https://www.raspberrypi.com/documentation/computers/config_txt.html#uart_2ndstage
-        # enable debug logging to the UART, also automatically enables
-        # UART logging in `start.elf`
-        uart_2ndstage = {
-          enable = true;
-          value = true;
-        };
-      };
+      # options = {
+      #     # https://www.raspberrypi.com/documentation/computers/config_txt.html#enable_uart
+      #     # in conjunction with `console=serial0,115200` in kernel command line (`cmdline.txt`)
+      #     # creates a serial console, accessible using GPIOs 14 and 15 (pins
+      #     #  8 and 10 on the 40-pin header)
+      #     enable_uart = {
+      #       enable = true;
+      #       value = true;
+      #     };
+      #     # https://www.raspberrypi.com/documentation/computers/config_txt.html#uart_2ndstage
+      #     # enable debug logging to the UART, also automatically enables
+      #     # UART logging in `start.elf`
+      #     uart_2ndstage = {
+      #       enable = true;
+      #       value = true;
+      #     };
+      #   };
 
       # Base DTB parameters
       # https://github.com/raspberrypi/linux/blob/a1d3defcca200077e1e382fe049ca613d16efd2b/arch/arm/boot/dts/overlays/README#L132
@@ -52,6 +57,24 @@ in
 
       };
 
+      # extra-config = ''
+      #   armstub=RPI_EFI.fd
+      #   device_tree_address=0x1f0000
+      #   device_tree_end=0x210000
+
+      #   # Force 32 bpp framebuffer allocation.
+      #   framebuffer_depth=32
+
+      #   # Disable compensation for displays with overscan.
+      #   disable_overscan=1
+
+      #   # Force maximum USB power regardless of the power supply.
+      #   usb_max_current_enable=1
+
+      #   # Force maximum CPU speed.
+      #   force_turbo=1
+      # '';
+
     };
   };
 }
diff --git a/systems/aarch64-linux/pi5/default.nix b/systems/aarch64-linux/pi5/default.nix
index 8a9a1f8..aba01a1 100644
--- a/systems/aarch64-linux/pi5/default.nix
+++ b/systems/aarch64-linux/pi5/default.nix
@@ -3,7 +3,6 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 {
-  pkgs,
   namespace,
   ...
 }:
@@ -45,16 +44,20 @@
     hardware = {
       disko = {
         enable = true;
-        enableFirmware = true;
+        firmware = {
+          enableFirmware = false;
+          firmwareDisk = "/dev/mmcblk0";
+        };
       };
       raspberry-pi = {
         enable = true;
         variant = "5";
-        pwm.enable = true;
-        disable-wifi.enable = true;
-        modesetting.enable = true; 
-        i2c.enable = true;
-        apply-overlays-dtmerge.enable = true;
+        bootType = "kernel";
+        pwm.enable = false;
+        disable-wifi.enable = false;
+        modesetting.enable = false;
+        i2c.enable = false;
+        apply-overlays-dtmerge.enable = false;
       };
     };
 
diff --git a/systems/x86_64-linux/matt-nixos/boot.nix b/systems/x86_64-linux/matt-nixos/boot.nix
index a694c6b..80d8ac0 100755
--- a/systems/x86_64-linux/matt-nixos/boot.nix
+++ b/systems/x86_64-linux/matt-nixos/boot.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, namespace, ... }:
+{
+  config,
+  pkgs,
+  namespace,
+  ...
+}:
 let
   kernel = pkgs.${namespace}.linuxPackages_cachyos-lto-znver4;
   pkgsVersion = pkgs; # .unstable;
diff --git a/systems/x86_64-linux/matt-nixos/default.nix b/systems/x86_64-linux/matt-nixos/default.nix
index b32f45c..6e0ece2 100644
--- a/systems/x86_64-linux/matt-nixos/default.nix
+++ b/systems/x86_64-linux/matt-nixos/default.nix
@@ -77,20 +77,20 @@
   #   capabilities = "cap_net_admin+p";
   # };
 
-#  specialisation = {
- #   "cosmic" = {
-#      enable = false;
-#      configuration = {
-#        ${namespace} = {
-#          desktop = {
-#            cosmic.enable = lib.mkForce true;
-#            hyprland = {
-#              enable = lib.mkForce false;
-#            };
- #           gnome.enable = lib.mkForce false;
- #         };
-#        };
-#      };
-#    };
-#  };
+  #  specialisation = {
+  #   "cosmic" = {
+  #      enable = false;
+  #      configuration = {
+  #        ${namespace} = {
+  #          desktop = {
+  #            cosmic.enable = lib.mkForce true;
+  #            hyprland = {
+  #              enable = lib.mkForce false;
+  #            };
+  #           gnome.enable = lib.mkForce false;
+  #         };
+  #        };
+  #      };
+  #    };
+  #  };
 }