flake stuff

flake.nix

@@ -194,8 +194,6 @@
       url = "github:NixOS/nixos-hardware/master";
     };
 
-    pi4-nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi";
-
     pi4-disko = {
       # the fork is needed for partition attributes support
       url = "github:nvmd/disko/gpt-attrs";
@@ -325,7 +323,6 @@
       pi5-impermanence,
       pi5-nixos-hardware,
       pi5-sops-nix,
-      pi5-nixos-raspberrypi,
       pi5-disko,
 
       # pi4
@@ -334,9 +331,10 @@
       pi4-impermanence,
       pi4-sops-nix,
       pi4-nixos-hardware,
-      pi4-nixos-raspberrypi,
       pi4-disko,
 
+      nixos-raspberrypi,
+
       # Steamdeck
       steamdeck-nixpkgs,
       steamdeck-chaotic,
@@ -506,7 +504,7 @@
         };
 
         # pi5
-        "pi5" = pi5-nixos-raspberrypi.lib.nixosSystem {
+        "pi5" = nixos-raspberrypi.lib.nixosSystem {
           specialArgs = inputs //
           {
             inherit outputs;
@@ -524,7 +522,7 @@
             {
               # Hardware specific configuration, see section below for a more complete
               # list of modules
-              imports = with pi5-nixos-raspberrypi.nixosModules; [
+              imports = with nixos-raspberrypi.nixosModules; [
                 raspberry-pi-5.base
                 raspberry-pi-5.display-vc4
                 raspberry-pi-5.bluetooth
@@ -556,7 +554,7 @@
         };
 
         # pi4
-        "pi4" = pi4-nixos-raspberrypi.lib.nixosSystem {
+        "pi4" = nixos-raspberrypi.lib.nixosSystem {
           specialArgs = inputs //
           {
             inherit outputs;
@@ -570,7 +568,7 @@
             {
               # Hardware specific configuration, see section below for a more complete
               # list of modules
-              imports = with pi4-nixos-raspberrypi.nixosModules; [
+              imports = with nixos-raspberrypi.nixosModules; [
                 raspberry-pi-4.base
                 raspberry-pi-4.display-vc4
                 raspberry-pi-4.bluetooth