From 504d48d19b448203f8f1a59b2c1e3580908ad8c4 Mon Sep 17 00:00:00 2001 From: ene Date: Mon, 20 Feb 2023 11:06:12 +0100 Subject: Fix(hosts): Use correct names and add mammun --- hosts/apzu/networking.nix | 2 +- hosts/mammun/configuration.nix | 19 +++++++++++++++++++ hosts/mammun/hardware/cpu.nix | 4 ++++ hosts/mammun/hardware/default.nix | 28 ++++++++++++++++++++++++++++ hosts/mammun/hardware/gpu.nix | 15 +++++++++++++++ hosts/mammun/networking.nix | 14 ++++++++++++++ hosts/spawn/networking.nix | 2 +- hosts/tiamat/networking.nix | 2 +- 8 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 hosts/mammun/configuration.nix create mode 100644 hosts/mammun/hardware/cpu.nix create mode 100644 hosts/mammun/hardware/default.nix create mode 100644 hosts/mammun/hardware/gpu.nix create mode 100644 hosts/mammun/networking.nix diff --git a/hosts/apzu/networking.nix b/hosts/apzu/networking.nix index d50b3af1..9a780fff 100644 --- a/hosts/apzu/networking.nix +++ b/hosts/apzu/networking.nix @@ -10,5 +10,5 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - networking.hostName = "Tiamat"; + networking.hostName = "apzu"; } diff --git a/hosts/mammun/configuration.nix b/hosts/mammun/configuration.nix new file mode 100644 index 00000000..8e78949b --- /dev/null +++ b/hosts/mammun/configuration.nix @@ -0,0 +1,19 @@ +# vim: ts=2 +{ + config, + lib, + nixpkgs, + home-manager, + ... +}: { + imports = [ + ./hardware + ./networking.nix + + ../../system + + ../../services + ]; + + system.stateVersion = "23.05"; +} diff --git a/hosts/mammun/hardware/cpu.nix b/hosts/mammun/hardware/cpu.nix new file mode 100644 index 00000000..2d7232cd --- /dev/null +++ b/hosts/mammun/hardware/cpu.nix @@ -0,0 +1,4 @@ +{config, ...}: { + powerManagement.cpuFreqGovernor = "powersave"; + hardware.cpu.amd.updateMicrocode = true; # Why not? +} diff --git a/hosts/mammun/hardware/default.nix b/hosts/mammun/hardware/default.nix new file mode 100644 index 00000000..bd7241b3 --- /dev/null +++ b/hosts/mammun/hardware/default.nix @@ -0,0 +1,28 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") # TODO is this necessary? + ./cpu.nix + ./gpu.nix + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + system.fileSystemLayouts = { + enable = true; + mainDisk = "/dev/disk/by-uuid/"; + efiDisk = "/dev/disk/by-uuid/"; + }; + + boot = { + kernelModules = ["kvm-amd"]; + + # TODO check this: + initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; + }; +} diff --git a/hosts/mammun/hardware/gpu.nix b/hosts/mammun/hardware/gpu.nix new file mode 100644 index 00000000..c3df51ae --- /dev/null +++ b/hosts/mammun/hardware/gpu.nix @@ -0,0 +1,15 @@ +{ + config, + pkgs, + lib, + ... +}: { + hardware.opengl.extraPackages = with pkgs; [ + rocm-opencl-icd # open-cl + amdvlk # or directly through mesa + amd-media-driver # libva + ]; + + # Force radv, TODO is this logical? + environment.variables.AMD_VULKAN_ICD = "RADV"; +} diff --git a/hosts/mammun/networking.nix b/hosts/mammun/networking.nix new file mode 100644 index 00000000..05c7d100 --- /dev/null +++ b/hosts/mammun/networking.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + ... +}: { + # 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.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + networking.hostName = "mammun"; +} diff --git a/hosts/spawn/networking.nix b/hosts/spawn/networking.nix index 7262c88e..11c97f67 100644 --- a/hosts/spawn/networking.nix +++ b/hosts/spawn/networking.nix @@ -10,5 +10,5 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - networking.hostName = "Spawn"; + networking.hostName = "spawn"; } diff --git a/hosts/tiamat/networking.nix b/hosts/tiamat/networking.nix index 17f7c356..04a87680 100644 --- a/hosts/tiamat/networking.nix +++ b/hosts/tiamat/networking.nix @@ -10,5 +10,5 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - networking.hostName = "Apzu"; + networking.hostName = "tiamat"; } -- cgit 1.4.1