From 7d21133d72c914658ca0f1ccafc795020fe38908 Mon Sep 17 00:00:00 2001 From: Dict Xiong Date: Thu, 13 Jun 2024 22:32:42 +0800 Subject: [PATCH] feat: add g3 --- flake.nix | 1 + hosts/g3/configuration.nix | 23 ++++++++++++++ hosts/g3/hardware-configuration.nix | 48 +++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 hosts/g3/configuration.nix create mode 100644 hosts/g3/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 51bfcc0..0eea0b5 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ let nixos-x86_64-hosts = [ "g2" + "g3" "g5" "g6" "g7" diff --git a/hosts/g3/configuration.nix b/hosts/g3/configuration.nix new file mode 100644 index 0000000..e9e6036 --- /dev/null +++ b/hosts/g3/configuration.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +{ + imports = + [ + ./hardware-configuration.nix + ../modules/nasp.nix + ]; + nasp = { + enable = true; + gSeries = { + enable = true; + serial = 3; + eth0Name = "eno1"; + eth1Name = "eno2"; + eth2Name = "enp2s0np0"; + }; + }; + boot.supportedFilesystems = [ "zfs" ]; + boot.zfs.forceImportRoot = false; + networking.hostId = "6693ee3d"; + system.stateVersion = "24.05"; +} diff --git a/hosts/g3/hardware-configuration.nix b/hosts/g3/hardware-configuration.nix new file mode 100644 index 0000000..7d1b098 --- /dev/null +++ b/hosts/g3/hardware-configuration.nix @@ -0,0 +1,48 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "ehci_pci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/e7fe3000-dc64-472d-a953-1ec91bb3b64d"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/57D3-2564"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/home2" = + { device = "home2"; + fsType = "zfs"; + neededForBoot = false; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/fca04db1-6cc1-4757-81a7-e07ab92f4899"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.eno2.useDHCP = lib.mkDefault true; + # networking.interfaces.enp2s0np0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}