Commit 391a15b56829

@@ -1,4 +1,8 @@
-_: {
+{
+  globals,
+  ...
+}:
+{
 
   imports = [
     ../common/hardware/laptop.nix
@@ -25,7 +29,7 @@ _: {
     '';
     wireguard = {
       enable = true;
-      ips = globals.fn.wg-ips globals.machines.kyushu.net.vpn.ips;
+      ips = globals.fn.wg-ips globals.machines.aomi.net.vpn.ips;
       endpoint = "${globals.net.vpn.endpoint}";
       endpointPublicKey = "${globals.net.vpn.pubkey}";
     };

@@ -1,12 +1,13 @@
 {
   inputs,
+  ...
 }:
 {
   imports = [
     # inputs.disko.nixosModules.diskop # Do this if re-install
     # (import ./disks.nix { inherit lib; })
 
-    inputs.nixos-hardware.nixosModules.lenovo-thinkap-p1-3th-gen
+    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p1-gen3
 
     ../common/hardware/acpid.nix
     # ../common/hardware/bluetooth.nix
@@ -24,7 +25,7 @@
       allowDiscards = true;
       keyFile = "/dev/disk/by-id/mmc-SD08G_0x704a5a38";
       keyFileSize = 4096;
-      fallbackToPassword = true;
+      # fallbackToPassword = true;
     };
   };
 

@@ -23,7 +23,6 @@
       forAllSystems = inputs.nixpkgs.lib.genAttrs supportedSystems;
 
       stableModules = [ inputs.home-manager-24_11.nixosModules.home-manager ];
-      unstableModules = [ inputs.home-manager.nixosModules.home-manager ];
       commonModules = [
         {
           config.nixpkgs.overlays = [
@@ -86,9 +85,9 @@
           desktop = "sway";
         };
         # Work workstation (unstable)
-        # aomi = libx.mkhost {
-        # 	hostname = "aomi";
-        # };
+        aomi = libx.mkHost {
+          hostname = "aomi";
+        };
         # # Servers (unstable)
         kobe = libx.mkHost { hostname = "kobe"; };
         athena = libx.mkHost {
@@ -113,17 +112,17 @@
         };
         # shikoku = libx.mkHost { hostname = "shikoku"; };
         # FIXME migrate to libx.mkHost
-        aomi = inputs.nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules =
-            commonModules
-            ++ unstableModules
-            ++ [
-              inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p1-gen3
-              inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
-              ./systems/hosts/aomi.nix
-            ];
-        };
+        # aomi = inputs.nixpkgs.lib.nixosSystem {
+        #   system = "x86_64-linux";
+        #   modules =
+        #     commonModules
+        #     ++ unstableModules
+        #     ++ [
+        #       inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p1-gen3
+        #       inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
+        #       ./systems/hosts/aomi.nix
+        #     ];
+        # };
 
         # Servers (stable)
         shikoku = inputs.nixpkgs-24_11.lib.nixosSystem {

@@ -117,7 +117,23 @@
         };
       };
     };
+    aomi = {
+      net = {
+        ips = [ "192.168.1.23" ];
+        vpn = {
+          pubkey = "XT4D9YLeVHwMb9R4mhBLSWHYF8iBO/UOT86MQL1jnA4=";
+          ips = [ "10.100.0.17" ];
+        };
+      };
+    };
     shikoku = {
+      net = {
+        ips = [ "192.168.1.24" ];
+        vpn = {
+          pubkey = "foUoAvJXGyFV4pfEE6ISwivAgXpmYmHwpGq6X+HN+yA=";
+          ips = [ "10.100.0.2" ];
+        };
+      };
       ssh = {
         vincent = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGxstR3xEf87leVVDS3GVPx8Ap9+eP+OfkSvM26V54XP vincent@shikoku";
       };