temp pi4

flake.nix

@@ -121,6 +121,8 @@
 
     nas-nixai.url = "github:olafkfreund/nix-ai-help";
 
+    nas-nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
+
     #####################################################
     #                     pi5                           #
     #####################################################
@@ -152,9 +154,7 @@
       inputs.nixpkgs.follows = "pi5-nixpkgs";
     };
 
-    nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi";
-
-    nas-nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
+    pi5-nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi";
 
     pi5-disko = {
       # the fork is needed for partition attributes support
@@ -196,8 +196,6 @@
 
     pi4-nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi";
 
-    pi4-argon40-nix.url = "github:guusvanmeerveld/argon40-nix";
-
     pi4-disko = {
       # the fork is needed for partition attributes support
       url = "github:nvmd/disko/gpt-attrs";
@@ -327,7 +325,7 @@
       pi5-impermanence,
       pi5-nixos-hardware,
       pi5-sops-nix,
-      nixos-raspberrypi,
+      pi5-nixos-raspberrypi,
       pi5-disko,
 
       # pi4
@@ -338,7 +336,6 @@
       pi4-nixos-hardware,
       pi4-nixos-raspberrypi,
       pi4-disko,
-      pi4-argon40-nix,
 
       # Steamdeck
       steamdeck-nixpkgs,
@@ -509,7 +506,7 @@
         };
 
         # pi5
-        "pi5" = nixos-raspberrypi.lib.nixosSystem {
+        "pi5" = pi5-nixos-raspberrypi.lib.nixosSystem {
           specialArgs = inputs //
           {
             inherit outputs;
@@ -527,7 +524,7 @@
             {
               # Hardware specific configuration, see section below for a more complete
               # list of modules
-              imports = with nixos-raspberrypi.nixosModules; [
+              imports = with pi5-nixos-raspberrypi.nixosModules; [
                 raspberry-pi-5.base
                 raspberry-pi-5.display-vc4
                 raspberry-pi-5.bluetooth
@@ -559,10 +556,10 @@
         };
 
         # pi4
-        "pi4" = pi4-nixpkgs.lib.nixosSystem {
-          # specialArgs = inputs;
-          specialArgs = {
-            inherit inputs outputs;
+        "pi4" = pi4-nixos-raspberrypi.lib.nixosSystem {
+          specialArgs = inputs //
+          {
+            inherit outputs;
           };
           system = "aarch64-linux";
           modules = [
@@ -570,10 +567,19 @@
             pi4-disko.nixosModules.disko
             ./share/disko/pi-uefi-disko.nix
             pi4-nixos-hardware.nixosModules.raspberry-pi-4
+            {
+              # Hardware specific configuration, see section below for a more complete
+              # list of modules
+              imports = with pi4-nixos-raspberrypi.nixosModules; [
+                raspberry-pi-4.base
+                raspberry-pi-4.display-vc4
+                raspberry-pi-4.bluetooth
+                raspberry-pi-4.case-argonone
+              ];
+            }
             pi4-impermanence.nixosModules.impermanence
             pi4-sops-nix.nixosModules.sops
             ./hosts/pi4/configuration.nix
-            pi4-argon40-nix.nixosModules.default
             pi4-home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;