chore(gengetsu): common nixos.hw.c4130

systems/gengetsu/default.nix

@@ -6,12 +6,10 @@ _: {
   modules = [
     ./nixos.nix
   ];
-  deploy.hostname = "10.1.1.204";
-  deploy.sshOpts = [];
-  #exports = {
-  #services = {
-  #};
-  #};
+  exports = {
+    services = {
+    };
+  };
   network.networks = {
     local = {
       macAddress = "54:48:10:f3:fe:aa";

systems/gengetsu/hardware-configuration.nix

@@ -0,0 +1,47 @@
+{
+  meta,
+  config,
+  ...
+}: {
+  imports = let
+    inherit (meta) nixos;
+  in [
+    nixos.hw.c4130
+    #nixos.netboot.kyuuto
+  ];
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/bf317f5d-ffc2-45fd-9621-b645ff7223fc";
+      fsType = "xfs";
+      options = ["lazytime" "noatime"];
+    };
+    "/boot" = {
+      device = "/dev/disk/by-label/boot";
+      fsType = "vfat";
+      options = ["fmask=0077" "dmask=0077"];
+    };
+  };
+
+  networking.useNetworkd = true;
+  systemd.network = {
+    networks."40-eno1" = {
+      inherit (config.systemd.network.links.eno1) matchConfig;
+      address = ["10.1.1.61/24"];
+      gateway = ["10.1.1.1"];
+      DHCP = "no";
+      networkConfig = {
+        IPv6AcceptRA = true;
+      };
+      linkConfig = {
+        Multicast = true;
+      };
+    };
+    links.eno1 = {
+      matchConfig = {
+        Type = "ether";
+        MACAddress = "54:48:10:f3:fe:aa";
+      };
+    };
+  };
+}

systems/gengetsu/nixos.nix

@@ -1,47 +1,11 @@
-{
-  meta,
-  config,
-  lib,
-  modulesPath,
-  pkgs,
-  ...
-}: {
+{meta, ...}: {
   imports = let
     inherit (meta) nixos;
   in [
+    ./hardware-configuration.nix
     #nixos.sops
     nixos.base
   ];
 
-  boot = {
-    initrd = {
-      availableKernelModules = ["ahci" "xhci_pci" "ehci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
-      kernelModules = [];
-      systemd.emergencyAccess = true;
-    };
-    kernelModules = [];
-    extraModulePackages = [];
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/bf317f5d-ffc2-45fd-9621-b645ff7223fc";
-      fsType = "xfs";
-    };
-    "/boot" = {
-      device = "/dev/disk/by-label/boot";
-      fsType = "vfat";
-      options = ["fmask=0077" "dmask=0077"];
-    };
-  };
-
-  environment.systemPackages = [
-    pkgs.ipmitool
-  ];
-
   system.stateVersion = "24.05";
 }

systems/logistics/hardware-configuration.nix

@@ -2,12 +2,19 @@
   config,
   pkgs,
   lib,
+  meta,
   ...
 }: let
   inherit (lib.modules) mkIf;
   opengl32 = false;
   opencl = false;
 in {
+  imports = let
+    inherit (meta) nixos;
+  in [
+    nixos.hw.metal
+  ];
+
   boot = {
     initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
     kernelModules = ["kvm-intel"];
@@ -41,4 +48,6 @@ in {
       ];
     };
   };
+
+  networking.networkmanager.enable = true;
 }

systems/logistics/nixos.nix

@@ -21,11 +21,6 @@ in {
     ./hardware-configuration.nix
   ];
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.networkmanager.enable = true;
-
   services.xserver = {
     enable = true;
     displayManager.lightdm.enable = true;

systems/mugetsu/hardware-configuration.nix

@@ -7,6 +7,7 @@
     inherit (meta) nixos;
   in [
     nixos.hw.c4130
+    nixos.netboot.kyuuto
   ];
 
   fileSystems = {

systems/mugetsu/nixos.nix

@@ -1,14 +1,10 @@
-{
-  meta,
-  ...
-}: {
+{meta, ...}: {
   imports = let
     inherit (meta) nixos;
   in [
     ./hardware-configuration.nix
     #nixos.sops
     nixos.base
-    nixos.netboot.kyuuto
   ];
 
   system.stateVersion = "24.11";