From 94b1faacfb5b291d60bd6bbb1da2a1511d9817ff Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Thu, 3 Oct 2024 00:20:27 -0700
Subject: akashi: fix up

---
 home/ebisu/fortune/system/ssh.nix    |  4 +--
 hosts/default.nix                    | 47 +++++++++++++++++++++---------------
 modules/desktop/software/default.nix |  1 +
 modules/desktop/software/tpm.nix     | 18 ++++++++++++++
 modules/pc/hardware/default.nix      |  1 -
 modules/pc/hardware/tpm.nix          | 18 --------------
 6 files changed, 48 insertions(+), 41 deletions(-)
 create mode 100644 modules/desktop/software/tpm.nix
 delete mode 100644 modules/pc/hardware/tpm.nix

diff --git a/home/ebisu/fortune/system/ssh.nix b/home/ebisu/fortune/system/ssh.nix
index 2f666d1..6a47791 100644
--- a/home/ebisu/fortune/system/ssh.nix
+++ b/home/ebisu/fortune/system/ssh.nix
@@ -13,9 +13,9 @@
     '';
 
     matchBlocks = {
-      "watson".user = "root";
-      "akashi".hostname = "192.168.1.219";
+      "akashi" = { };
       "himeji".user = "root";
+      "watson".user = "root";
 
       "github.com" = {
         user = "git";
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
+            ;
+        };
       };
-    };
   };
 }
diff --git a/modules/desktop/software/default.nix b/modules/desktop/software/default.nix
index fd93550..7e25f9a 100644
--- a/modules/desktop/software/default.nix
+++ b/modules/desktop/software/default.nix
@@ -6,6 +6,7 @@
     ./nvidia.nix
     ./programs.nix
     ./systemd.nix
+    ./tpm.nix
   ];
 
   services.displayManager.ly.enable = true;
diff --git a/modules/desktop/software/tpm.nix b/modules/desktop/software/tpm.nix
new file mode 100644
index 0000000..b84551e
--- /dev/null
+++ b/modules/desktop/software/tpm.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+{
+  security.tpm2 = {
+    enable = true;
+    applyUdevRules = true;
+    abrmd.enable = true;
+    tctiEnvironment.enable = true;
+    pkcs11.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    tpm2-tools
+    tpm2-tss
+    tpm2-abrmd
+  ];
+
+  boot.kernelModules = [ "uhid" ];
+}
diff --git a/modules/pc/hardware/default.nix b/modules/pc/hardware/default.nix
index cc2915e..7531556 100644
--- a/modules/pc/hardware/default.nix
+++ b/modules/pc/hardware/default.nix
@@ -3,7 +3,6 @@
     ./bluetooth.nix
     ./cpu.nix
     ./usb.nix
-    ./tpm.nix
     ./yubikey.nix
   ];
 
diff --git a/modules/pc/hardware/tpm.nix b/modules/pc/hardware/tpm.nix
deleted file mode 100644
index b84551e..0000000
--- a/modules/pc/hardware/tpm.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-{
-  security.tpm2 = {
-    enable = true;
-    applyUdevRules = true;
-    abrmd.enable = true;
-    tctiEnvironment.enable = true;
-    pkcs11.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    tpm2-tools
-    tpm2-tss
-    tpm2-abrmd
-  ];
-
-  boot.kernelModules = [ "uhid" ];
-}
-- 
cgit v1.2.3