From 8f4de3964f99017dfaebf169c3c4ff83cad956d3 Mon Sep 17 00:00:00 2001 From: kenji Date: Mon, 30 Jun 2025 15:42:14 -0500 Subject: [PATCH] added amd --- modules/de.nix | 5 ++- packages/mangohud/default.nix | 66 +++-------------------------------- system/amd.nix | 6 ++++ system/gaming.nix | 6 +++- system/graphics.nix | 7 +++- 5 files changed, 25 insertions(+), 65 deletions(-) create mode 100644 system/amd.nix diff --git a/modules/de.nix b/modules/de.nix index ab3614e..beca8bb 100644 --- a/modules/de.nix +++ b/modules/de.nix @@ -8,8 +8,11 @@ ../system/font.nix ../system/browser.nix ../system/wayland.nix + ../system/graphics.nix + + # FIXME + ../system/amd.nix ] ++ lib.optionals (myConfig.linux.gaming == true) [ - ../system/graphics.nix ]; } diff --git a/packages/mangohud/default.nix b/packages/mangohud/default.nix index 9033349..5f260b7 100644 --- a/packages/mangohud/default.nix +++ b/packages/mangohud/default.nix @@ -4,69 +4,11 @@ enableSessionWide = true; settings = { toggle_hud = "Shift_R+F12"; - legacyLayout = false; - backgroundAlpha = 0.6; - roundCorners = 10; - backgroundColor = "000000"; - - fontSize = 24; - textColor = "FFFFFF"; - position = "top-left"; - - tableColumns = 3; - - gpuText = "GPU"; - gpuStats = true; - gpuLoadChange = true; - gpuLoadValue = "50,90"; - gpuLoadColor = "FFFFFF,FFAA7F,CC0000"; - gpuCoreClock = true; - gpuMemClock = true; - gpuTemp = true; - gpuPower = true; - gpuColor = "2E9762"; - - cpuText = "CPU"; - cpuStats = true; # Assuming this implies cpu_stats is enabled - cpuLoadChange = true; - cpuLoadValue = "50,90"; - cpuLoadColor = "FFFFFF,FFAA7F,CC0000"; - cpuMhz = true; - cpuTemp = true; - cpuPower = true; - cpuColor = "2E97CB"; - - vram = true; - vramColor = "AD64C1"; # Note: you had this twice, keeping one - - ram = true; - ramColor = "C26693"; - - battery = true; - batteryColor = "00FF00"; - - fps = true; - fpsMetrics = "avg,0.01"; - engineVersion = true; - engineColor = "EB5B5B"; - frameTiming = true; - frametimeColor = "FFFFFF"; - fpsLimitMethod = "late"; - toggleFpsLimit = "Shift_L+F1"; - fpsLimit = 0; - fpsColorChange = true; - fpsColor = "B22222,FDFD09,39F900"; - fpsValue = "30,60"; - - # The 'offset' setting was commented out in your original file, - # so it's omitted here. - - outputFolder = "/home/kenji"; - logDuration = 30; - autostartLog = 0; - logInterval = 100; - toggleLogging = "Shift_L+F2"; + full = true; + gpu_temp = true; + cpu_temp = true; + fps_only = false; blacklist = [ "pamac-manager" diff --git a/system/amd.nix b/system/amd.nix new file mode 100644 index 0000000..f3ede6d --- /dev/null +++ b/system/amd.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + glxinfo + vulkan-tools + ]; +} diff --git a/system/gaming.nix b/system/gaming.nix index 7466e10..f2717f9 100644 --- a/system/gaming.nix +++ b/system/gaming.nix @@ -3,10 +3,14 @@ inputs, ... }: { - programs.steam.enable = true; + programs.steam = { + enable = true; + gamescopeSession.enable = true; + }; environment.systemPackages = [ # inputs.nix-gaming.packages.${pkgs.system}.default pkgs.protonup-qt + pkgs.geekbench ]; # programs.steam.platformOptimizations.enable = true; } diff --git a/system/graphics.nix b/system/graphics.nix index 93689f0..0e126af 100644 --- a/system/graphics.nix +++ b/system/graphics.nix @@ -1,6 +1,11 @@ -{...}: { +{pkgs, ...}: { hardware.graphics = { enable = true; enable32Bit = true; # Crucial for 32-bit games }; + programs.corectrl = { + enable = true; + }; + systemd.packages = with pkgs; [corectrl]; + systemd.services.corectrl.wantedBy = ["multi-user.target"]; }