format all

This commit is contained in:
Kopatz
2025-10-30 21:59:31 +01:00
parent b1dda4d037
commit 8a78e618bb
188 changed files with 3526 additions and 1825 deletions

View File

@@ -1,54 +1,73 @@
{ lib, config, pkgs, inputs, pkgsVersion, ... }:
let cfg = config.custom.hardware.amd-gpu;
in {
{
lib,
config,
pkgs,
inputs,
pkgsVersion,
...
}:
let
cfg = config.custom.hardware.amd-gpu;
in
{
options.custom.hardware.amd-gpu = {
enable = lib.mkEnableOption "Enables amd gpus";
overdrive = lib.mkEnableOption "Enables overdrive";
rocm.enable = lib.mkEnableOption "Enables rocm";
};
config =
lib.mkIf cfg.enable {
boot.kernelParams = lib.mkIf cfg.overdrive
[ "amdgpu.ppfeaturemask=0xfff7ffff" "split_lock_detect=off" ];
config = lib.mkIf cfg.enable {
boot.kernelParams = lib.mkIf cfg.overdrive [
"amdgpu.ppfeaturemask=0xfff7ffff"
"split_lock_detect=off"
];
hardware.graphics = {
enable = true;
enable32Bit = true;
extraPackages = lib.mkIf cfg.rocm.enable (with pkgs; [ rocmPackages.clr rocmPackages.clr.icd ]);
};
hardware.graphics = {
enable = true;
enable32Bit = true;
extraPackages = lib.mkIf cfg.rocm.enable (
with pkgs;
[
rocmPackages.clr
rocmPackages.clr.icd
]
);
};
hardware.amdgpu.initrd.enable = lib.mkDefault true;
services.xserver.videoDrivers = [ "amdgpu" ];
# controller (overclock, undervolt, fan curves)
environment.systemPackages = with pkgs; [
hardware.amdgpu.initrd.enable = lib.mkDefault true;
services.xserver.videoDrivers = [ "amdgpu" ];
# controller (overclock, undervolt, fan curves)
environment.systemPackages =
with pkgs;
[
nvtopPackages.amd
amdgpu_top
] ++ lib.optionals cfg.rocm.enable [
]
++ lib.optionals cfg.rocm.enable [
clinfo
rocmPackages.rocminfo
] ++ lib.optionals cfg.overdrive [
]
++ lib.optionals cfg.overdrive [
lact
];
systemd = {
packages = lib.mkIf cfg.overdrive (with pkgs; [ lact ]);
services.lactd.wantedBy = lib.mkIf cfg.overdrive [ "multi-user.target" ];
#rocm
tmpfiles.rules =
let
rocmEnv = pkgs.symlinkJoin {
name = "rocm-combined";
paths = with pkgs.rocmPackages; [
rocblas
hipblas
clr
];
};
in
lib.mkIf cfg.rocm.enable
[
"L+ /opt/rocm - - - - ${rocmEnv}"
systemd = {
packages = lib.mkIf cfg.overdrive (with pkgs; [ lact ]);
services.lactd.wantedBy = lib.mkIf cfg.overdrive [ "multi-user.target" ];
#rocm
tmpfiles.rules =
let
rocmEnv = pkgs.symlinkJoin {
name = "rocm-combined";
paths = with pkgs.rocmPackages; [
rocblas
hipblas
clr
];
};
};
in
lib.mkIf cfg.rocm.enable [
"L+ /opt/rocm - - - - ${rocmEnv}"
];
};
};
}

View File

@@ -1,6 +1,13 @@
{ config, pkgs, lib, ... }:
let cfg = config.custom.hardware.android;
in {
{
config,
pkgs,
lib,
...
}:
let
cfg = config.custom.hardware.android;
in
{
options.custom.hardware.android = {
enable = lib.mkEnableOption "Enables android phone support";
};
@@ -9,7 +16,7 @@ in {
programs.adb = {
enable = true;
};
environment.systemPackages = with pkgs;[
environment.systemPackages = with pkgs; [
scrcpy # mirrors screen to pc, -S turns off screen while active, --render-driver opengl uses opengl for rendering
];
users.users.${config.mainUser.name}.extraGroups = [ "adbusers" ];

View File

@@ -1,4 +1,5 @@
{ pkgs, config, ... }: {
{ pkgs, config, ... }:
{
imports = [
./amd-gpu.nix
./android.nix

View File

@@ -1,6 +1,13 @@
{ config, pkgs, lib, ... }:
let cfg = config.custom.hardware.fingerprint;
in {
{
config,
pkgs,
lib,
...
}:
let
cfg = config.custom.hardware.fingerprint;
in
{
options.custom.hardware.fingerprint = {
enable = lib.mkEnableOption "Enables fingerprint sensor support";
};

View File

@@ -12,4 +12,3 @@ in
services.fwupd.enable = true;
};
}

View File

@@ -1,6 +1,15 @@
{ lib, config, pkgs, inputs, pkgsVersion, ... }:
let cfg = config.custom.hardware.nvidia;
in {
{
lib,
config,
pkgs,
inputs,
pkgsVersion,
...
}:
let
cfg = config.custom.hardware.nvidia;
in
{
options.custom.hardware.nvidia = {
enable = lib.mkEnableOption "Enables nvidia gpus";
powerLimit = {
@@ -32,51 +41,57 @@ in {
let
# the option was renamed in unstable
nvidiaOption =
if (pkgsVersion == inputs.nixpkgs-unstable) then {
hardware.graphics = {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [ nvidia-vaapi-driver ];
if (pkgsVersion == inputs.nixpkgs-unstable) then
{
hardware.graphics = {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [ nvidia-vaapi-driver ];
};
}
else
{
hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
};
};
} else {
hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
};
};
nvidia_oc = "${pkgs.nvidia_oc}/bin/nvidia_oc";
in
lib.mkIf cfg.enable (lib.recursiveUpdate nvidiaOption {
boot.kernelParams =
[ "nvidia-drm.fbdev=1" "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ];
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.deviceSection = ''
Option "Coolbits" "24"
'';
hardware.nvidia = {
# Modesetting is required.
modesetting.enable = true;
# Open drivers with gsp stutters in VR - https://github.com/ValveSoftware/SteamVR-for-Linux/issues/631
gsp.enable = config.hardware.nvidia.open;
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
powerManagement.enable = false;
# Fine-grained power management. Turns off GPU when not in use.
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
powerManagement.finegrained = false;
# Use the NVidia open source kernel module (not to be confused with the
# independent third-party "nouveau" open source driver).
# Support is limited to the Turing and later architectures. Full list of
# supported GPUs is at:
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
# Only available from driver 515.43.04+
# GSP must be enabled for this to work.
open = false;
# Enable the Nvidia settings menu,
# accessible via `nvidia-settings`.
nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.beta;
lib.mkIf cfg.enable (
lib.recursiveUpdate nvidiaOption {
boot.kernelParams = [
"nvidia-drm.fbdev=1"
"nvidia.NVreg_PreserveVideoMemoryAllocations=1"
];
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.deviceSection = ''
Option "Coolbits" "24"
'';
hardware.nvidia = {
# Modesetting is required.
modesetting.enable = true;
# Open drivers with gsp stutters in VR - https://github.com/ValveSoftware/SteamVR-for-Linux/issues/631
gsp.enable = config.hardware.nvidia.open;
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
powerManagement.enable = false;
# Fine-grained power management. Turns off GPU when not in use.
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
powerManagement.finegrained = false;
# Use the NVidia open source kernel module (not to be confused with the
# independent third-party "nouveau" open source driver).
# Support is limited to the Turing and later architectures. Full list of
# supported GPUs is at:
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
# Only available from driver 515.43.04+
# GSP must be enabled for this to work.
open = false;
# Enable the Nvidia settings menu,
# accessible via `nvidia-settings`.
nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.beta;
#package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
# version = "570.124.04";
# sha256_64bit = "sha256-G3hqS3Ei18QhbFiuQAdoik93jBlsFI2RkWOBXuENU8Q=";
@@ -85,40 +100,35 @@ in {
# settingsSha256 = "sha256-LNL0J/sYHD8vagkV1w8tb52gMtzj/F0QmJTV1cMaso8=";
# persistencedSha256 = "";
#};
};
};
environment.systemPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
libva
libva-utils
pkgs.nvidia_oc
(gwe.override { nvidia_x11 = config.hardware.nvidia.package; })
];
environment.systemPackages = with pkgs; [
vaapiVdpau
libvdpau-va-gl
libva
libva-utils
pkgs.nvidia_oc
(gwe.override { nvidia_x11 = config.hardware.nvidia.package; })
];
environment.sessionVariables = {
# for firefox, see https://github.com/elFarto/nvidia-vaapi-driver/#firefox
MOZ_DISABLE_RDD_SANDBOX = "1";
LIBVA_DRIVER_NAME = "nvidia";
};
environment.sessionVariables = {
# for firefox, see https://github.com/elFarto/nvidia-vaapi-driver/#firefox
MOZ_DISABLE_RDD_SANDBOX = "1";
LIBVA_DRIVER_NAME = "nvidia";
};
systemd.services.nvidiaSetPower = lib.mkIf cfg.powerLimit.enable {
description =
"Increase GPU power limit to ${toString cfg.powerLimit.wattage} watts";
script = "/run/current-system/sw/bin/nvidia-smi -pl=${
toString cfg.powerLimit.wattage
}";
wantedBy = [ "multi-user.target" ];
};
systemd.services.nvidiaSetClocks = lib.mkIf cfg.clock.enable {
description = "Set GPU clocks";
script =
"${nvidia_oc} set -i 0 --min-clock ${toString cfg.clock.min} --max-clock ${
toString cfg.clock.max
} --freq-offset ${toString cfg.clock.offset}";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
};
systemd.services.nvidiaSetPower = lib.mkIf cfg.powerLimit.enable {
description = "Increase GPU power limit to ${toString cfg.powerLimit.wattage} watts";
script = "/run/current-system/sw/bin/nvidia-smi -pl=${toString cfg.powerLimit.wattage}";
wantedBy = [ "multi-user.target" ];
};
systemd.services.nvidiaSetClocks = lib.mkIf cfg.clock.enable {
description = "Set GPU clocks";
script = "${nvidia_oc} set -i 0 --min-clock ${toString cfg.clock.min} --max-clock ${toString cfg.clock.max} --freq-offset ${toString cfg.clock.offset}";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
};
});
}
);
}

View File

@@ -1,4 +1,5 @@
{ config, pkgs, ... }: {
{ config, pkgs, ... }:
{
boot = {
extraModulePackages = with config.boot.kernelPackages; [ zenpower ];

View File

@@ -16,4 +16,3 @@ in
hardware.system76.enableAll = true;
};
}

View File

@@ -12,4 +12,3 @@ in
services.fstrim.enable = true;
};
}

View File

@@ -1,7 +1,14 @@
{ pkgs, config, lib, ... }:
{
pkgs,
config,
lib,
...
}:
with lib;
let cfg = config.custom.hardware.tablet;
in {
let
cfg = config.custom.hardware.tablet;
in
{
options.custom.hardware.tablet = {
enable = mkEnableOption "Enables tablet";
};

View File

@@ -1,8 +1,17 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
with lib;
let cfg = config.custom.hardware.tpm;
in {
options.custom.hardware.tpm = { enable = mkEnableOption "Enables tpm"; };
let
cfg = config.custom.hardware.tpm;
in
{
options.custom.hardware.tpm = {
enable = mkEnableOption "Enables tpm";
};
config = mkIf cfg.enable {

View File

@@ -1,4 +1,9 @@
{ pkgs, lib, config, ... }:
{
pkgs,
lib,
config,
...
}:
with lib;
let
cfg = config.custom.hardware.vfio;
@@ -15,9 +20,24 @@ in
config = mkIf (cfg.enable && config.virtualisation.libvirtd.enable) {
boot = {
kernelModules = [ "vfio" "vfio_iommu_type1" "vfio_pci" ];
kernelParams = [ "amd_iommu=on" "iommu=pt" ] ++ (if cfg.stub_pci != [] then [ "vfio-pci.ids=${concatStringsSep "," cfg.stub_pci}" ] else []);
blacklistedKernelModules = [ "nouveau" "nvidia" "nvidiafb" "nvidia-drm" "nvidia-uvm" "nvidia-modeset" ];
kernelModules = [
"vfio"
"vfio_iommu_type1"
"vfio_pci"
];
kernelParams = [
"amd_iommu=on"
"iommu=pt"
]
++ (if cfg.stub_pci != [ ] then [ "vfio-pci.ids=${concatStringsSep "," cfg.stub_pci}" ] else [ ]);
blacklistedKernelModules = [
"nouveau"
"nvidia"
"nvidiafb"
"nvidia-drm"
"nvidia-uvm"
"nvidia-modeset"
];
};
};
}

View File

@@ -1,16 +1,27 @@
{ pkgs, config, lib, ... }:
{
pkgs,
config,
lib,
...
}:
let
cfg = config.custom.hardware.vr;
# https://wiki.nixos.org/wiki/VR#Patching_AMDGPU_to_allow_high_priority_queues
amdgpu =
{ pkgs
, lib
, kernel ? pkgs.linuxPackages_latest.kernel
{
pkgs,
lib,
kernel ? pkgs.linuxPackages_latest.kernel,
}:
pkgs.stdenv.mkDerivation {
pname = "amdgpu-kernel-module";
inherit (kernel) src version postPatch nativeBuildInputs;
inherit (kernel)
src
version
postPatch
nativeBuildInputs
;
kernel_dev = kernel.dev;
kernelVersion = kernel.modDirVersion;

View File

@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
with lib;
let
cfg = config.custom.hardware.wooting;