more cleanup

systems/aarch64-linux/pi4/default.nix

@@ -3,14 +3,9 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 {
-  lib,
-  pkgs,
   namespace,
   ...
 }:
-let
-  kernelBundle = pkgs.linuxAndFirmware.latest;
-in
 {
   imports = [
     ./adguard.nix
@@ -20,7 +15,13 @@ in
   ];
 
   ${namespace} = {
-    hardware.disko.enable = true;
+    hardware = {
+      disko.enable = true;
+      raspberry-pi = {
+        enable = true;
+        variant = "4";
+      };
+    };
     user = {
       name = "matt";
       password = "BogieDudie1";
@@ -51,50 +52,9 @@ in
     };
   };
 
-  # Configure nixpkgs
-  nixpkgs = {
-    overlays = lib.mkAfter [
-      (_self: _super: {
-        # This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
-        # enableRedistributableFirmware is enabled
-        # I know no easier way to override this package
-        inherit (kernelBundle) raspberrypiWirelessFirmware;
-        # Some derivations want to use it as an input,
-        # e.g. raspberrypi-dtbs, omxplayer, sd-image-* modules
-        inherit (kernelBundle) raspberrypifw;
-      })
-    ];
-  };
-  hardware.i2c.enable = true;
-
-  systemd.services.btattach = {
-    before = [ "bluetooth.service" ];
-    after = [ "dev-ttyAMA0.device" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      ExecStart = "${pkgs.bluez}/bin/btattach -B /dev/ttyAMA0 -P bcm -S 3000000";
-    };
-  };
-
-  environment = {
-    systemPackages = with pkgs; [
-      i2c-tools
-      libraspberrypi
-      raspberrypi-eeprom
-      raspberrypifw
-      raspberrypiWirelessFirmware
-      raspberrypi-armstubs
-    ];
-  };
-
   # Root user configuration - explicit to avoid conflicts with home-manager
   users.users.root = {
     isSystemUser = true;
     isNormalUser = false;
-    shell = pkgs.zsh;
-  };
-
-  programs = {
-    kdeconnect.enable = false;
   };
 }

systems/aarch64-linux/pi5/default.nix

@@ -3,15 +3,9 @@
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
 {
-  config,
-  lib,
-  pkgs,
   namespace,
   ...
 }:
-let
-  kernelBundle = pkgs.linuxAndFirmware.latest;
-in
 {
   imports = [
     ./boot.nix
@@ -21,7 +15,13 @@ in
   ];
 
   ${namespace} = {
-    hardware.disko.enable = true;
+    hardware = {
+      disko.enable = true;
+      raspberry-pi = {
+        enable = true;
+        variant = "5";
+      };
+    };
     desktop.hyprland.enable = false;
     user = {
       name = "matt";
@@ -46,63 +46,4 @@ in
       };
     };
   };
-
-  # Configure nixpkgs
-  nixpkgs = {
-    overlays = lib.mkAfter [
-      (_self: _super: {
-        # This is used in (modulesPath + "/hardware/all-firmware.nix") when at least
-        # enableRedistributableFirmware is enabled
-        # I know no easier way to override this package
-        inherit (kernelBundle) raspberrypiWirelessFirmware;
-        # Some derivations want to use it as an input,
-        # e.g. raspberrypi-dtbs, omxplayer, sd-image-* modules
-        inherit (kernelBundle) raspberrypifw;
-      })
-    ];
-  };
-
-  system.nixos.tags =
-    let
-      cfg = config.boot.loader.raspberry-pi;
-    in
-    [
-      "raspberry-pi-${cfg.variant}"
-      cfg.bootloader
-      config.boot.kernelPackages.kernel.version
-    ];
-
-  systemd.services.btattach = {
-    before = [ "bluetooth.service" ];
-    after = [ "dev-ttyAMA0.device" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      ExecStart = "${pkgs.bluez}/bin/btattach -B /dev/ttyAMA0 -P bcm -S 3000000";
-    };
-  };
-
-  environment = {
-    systemPackages = with pkgs; [
-      erofs-utils
-      fex
-      libraspberrypi
-      raspberrypi-eeprom
-      raspberrypifw
-      raspberrypiWirelessFirmware
-      raspberrypi-armstubs
-      squashfuse
-      squashfsTools
-    ];
-  };
-
-  hardware.graphics.enable32Bit = lib.mkForce false;
-
-  # Root user configuration
-  users.users.root.shell = pkgs.zsh;
-
-  programs = {
-    kdeconnect.enable = false;
-  };
-
-  zramSwap.enable = true;
 }