diff --git a/flake.nix b/flake.nix index c18ddfc..a3568f1 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ bootMode = "uefi"; # uefi or bios bootMountPath = "/boot"; # mount path for efi boot partition; only used for uefi boot mode grubDevice = ""; # device identifier for grub; only used for legacy (bios) boot mode + gpuType = "amd"; # amd, intel or nvidia; only makes some slight mods for amd at the moment }; # ----- USER SETTINGS ----- # @@ -48,7 +49,7 @@ # create patched nixpkgs nixpkgs-patched = - (import inputs.nixpkgs { system = systemSettings.system; }).applyPatches { + (import inputs.nixpkgs { system = systemSettings.system; rocmSupport = (if systemSettings.gpu == "amd" then true else false); }).applyPatches { name = "nixpkgs-patched"; src = inputs.nixpkgs; patches = [ ./patches/emacs-no-version-check.patch ]; diff --git a/profiles/work/home.nix b/profiles/work/home.nix index fa6fae4..af0cfd4 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -58,6 +58,8 @@ numbat element-desktop-wayland + openai-whisper-cpp + wine bottles # The following requires 64-bit FL Studio (FL64) to be installed to a bottle diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index daf2657..34005b9 100644 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -12,7 +12,7 @@ boot.initrd.kernelModules = [ "radeon" ]; boot.kernelModules = [ "kvm-amd" "radeon" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; - hardware.opengl.extraPackages = [ pkgs.amdvlk ]; + hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocmPackages.clr.icd ]; hardware.opengl.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; systemd.tmpfiles.rules = [