From 0adf7125c91ed5f54a1b003fb60bb668e05f847c Mon Sep 17 00:00:00 2001 From: Dict Xiong Date: Thu, 13 Jun 2024 20:16:57 +0800 Subject: [PATCH] feat: add g5 --- flake.nix | 1 + hosts/g5/configuration.nix | 23 ++++++++++++++ hosts/g5/hardware-configuration.nix | 47 +++++++++++++++++++++++++++++ hosts/modules/nasp.nix | 4 +++ 4 files changed, 75 insertions(+) create mode 100644 hosts/g5/configuration.nix create mode 100644 hosts/g5/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index d4caf95..a4fc65d 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ let nixos-x86_64-hosts = [ "g2" + "g5" "g7" "g10" "g11" diff --git a/hosts/g5/configuration.nix b/hosts/g5/configuration.nix new file mode 100644 index 0000000..742a853 --- /dev/null +++ b/hosts/g5/configuration.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +{ + imports = + [ + ./hardware-configuration.nix + ../modules/nasp.nix + ]; + nasp = { + enable = true; + gSeries = { + enable = true; + serial = 5; + eth0Name = "eno1"; + eth1Name = "eno2"; + eth2Name = "enp2s0np0"; + }; + }; + boot.supportedFilesystems = [ "zfs" ]; + boot.zfs.forceImportRoot = false; + networking.hostId = "b24b8b5f"; + system.stateVersion = "24.05"; +} diff --git a/hosts/g5/hardware-configuration.nix b/hosts/g5/hardware-configuration.nix new file mode 100644 index 0000000..b9fa822 --- /dev/null +++ b/hosts/g5/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/6bda0ad0-e49a-468e-a907-58867a93f4ea"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/A6C8-749C"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/home2" = { + device = "/dev/ubuntu-vg/home2"; + fsType = "ext4"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/1a847ae4-63f6-4ab9-a923-e3d0502dc453"; } + ]; + + # 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; +} diff --git a/hosts/modules/nasp.nix b/hosts/modules/nasp.nix index bc799d8..fc76d95 100644 --- a/hosts/modules/nasp.nix +++ b/hosts/modules/nasp.nix @@ -304,6 +304,10 @@ in enable = true; interfaces = [ "${gCfg.eth2Name}" ]; }; + fileSystems."/share" = { + device = "192.168.16.118:/data0/share"; + fsType = "nfs"; + }; ## packages and services nasp.docker.enable = true; nasp.nvidia.enable = true;