diff --git a/kuro/configuration.nix b/kuro/configuration.nix index 07d2abe..b8807c8 100644 --- a/kuro/configuration.nix +++ b/kuro/configuration.nix @@ -1,6 +1,6 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). +# and in the NixOS manual (accessible by running `nixos-help`). { config, pkgs, ... }: @@ -11,10 +11,22 @@ ./hardware-configuration.nix # Shared config of all machines - /home/cullmann/install/nixos/common.nix + /data/nixos/common.nix ]; - # host name & id + # host name networking.hostName = "kuro"; - networking.hostId = "862cf3b5"; + + # main network interface via systemd-networkd + networking.useDHCP = false; + systemd.network.enable = true; + systemd.network.networks."10-lan" = { + matchConfig.Name = "enp2s0"; + networkConfig.DHCP = "yes"; + linkConfig.RequiredForOnline = "routable"; + }; + + # amd graphics + hardware.opengl.extraPackages = with pkgs; [ amdvlk rocm-opencl-icd rocm-opencl-runtime ]; + hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ amdvlk ]; } diff --git a/kuro/hardware-configuration.nix b/kuro/hardware-configuration.nix index 2a9b0bc..135dacc 100644 --- a/kuro/hardware-configuration.nix +++ b/kuro/hardware-configuration.nix @@ -9,7 +9,7 @@ ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; @@ -60,15 +60,6 @@ swapDevices = [ ]; - # 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.enp1s0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }