akashi: fix up

1 files changed, 27 insertions, 20 deletions

diff --git a/hosts/default.nix b/hosts/default.nix
index e30102a..9b45eaf 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -13,9 +13,14 @@ let
     sops-nix.nixosModules.sops
   ];
 
-  pcModules = [
-    inputs.nix-gaming.nixosModules.pipewireLowLatency
-  ];
+  pcModules =
+    system:
+    with inputs;
+    [
+      nix-gaming.nixosModules.pipewireLowLatency
+      pia.nixosModules.${system}.default
+    ]
+    ++ defaultModules;
 in
 {
   flake.nixosConfigurations = with lib; {
@@ -43,13 +48,11 @@ in
           with inputs;
           [
             home-manager.nixosModule
-            pia.nixosModules.${pkgs.system}.default
             nur.nixosModules.nur
             chaotic.nixosModules.default
             ./kansai
           ]
-          ++ defaultModules
-          ++ pcModules;
+          ++ pcModules pkgs.system;
       };
 
     himeji = nixosSystem {
@@ -74,22 +77,26 @@ in
       ] ++ defaultModules;
     };
 
-    akashi = nixosSystem {
-      modules = [ ./akashi ] ++ defaultModules ++ pcModules;
+    akashi =
+      let
+        pkgs =
+          (kansaiPkgs {
+            nixpkgsAllowUnfree = true;
+          })."x86_64-linux";
+      in
+      nixosSystem {
+        inherit pkgs;
 
-      pkgs =
-        (kansaiPkgs {
-          nixpkgsAllowUnfree = true;
-        })."x86_64-linux";
+        modules = [ ./akashi ] ++ pcModules pkgs.system;
 
-      specialArgs = {
-        inherit
-          inputs
-          outputs
-          secrets
-          self
-          ;
+        specialArgs = {
+          inherit
+            inputs
+            outputs
+            secrets
+            self
+            ;
+        };
       };
-    };
   };
 }