From 6000890b398b1bc0c3ead4dcf900c802aa3a3b6c Mon Sep 17 00:00:00 2001 From: Dict Xiong Date: Thu, 13 Jun 2024 12:48:00 +0800 Subject: [PATCH] feat: add g7 --- flake.nix | 1 + hosts/g7/configuration.nix | 23 ++++++++++++++ hosts/g7/hardware-configuration.nix | 47 +++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 hosts/g7/configuration.nix create mode 100644 hosts/g7/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index fe51f86..d4caf95 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ let nixos-x86_64-hosts = [ "g2" + "g7" "g10" "g11" "g12" diff --git a/hosts/g7/configuration.nix b/hosts/g7/configuration.nix new file mode 100644 index 0000000..1269356 --- /dev/null +++ b/hosts/g7/configuration.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +{ + imports = + [ + ./hardware-configuration.nix + ../modules/nasp.nix + ]; + nasp = { + enable = true; + gSeries = { + enable = true; + serial = 7; + eth0Name = "eno1"; + eth1Name = "eno2"; + eth2Name = "enp2s0np0"; + }; + }; + boot.supportedFilesystems = [ "zfs" ]; + boot.zfs.forceImportRoot = false; + networking.hostId = "b2fd3ffb"; + system.stateVersion = "24.05"; +} diff --git a/hosts/g7/hardware-configuration.nix b/hosts/g7/hardware-configuration.nix new file mode 100644 index 0000000..8788d1b --- /dev/null +++ b/hosts/g7/hardware-configuration.nix @@ -0,0 +1,47 @@ +# 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 = [ "dm-snapshot" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/52a05202-9b93-4541-a245-19e0e810e1a0"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/6735-4C79"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/home2" = { + device = "/dev/ubuntu-vg/home2"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/6f4b530c-6369-4d09-99dd-61bbd2c32642"; } + ]; + + # 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; +}