matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: get rid of isNvidia

Browse source
This commit is contained in:
matt1432 2024-03-03 17:34:21 -05:00
parent 477ef7759a
commit 88d5d1bdd8
4 changed files with 6 additions and 11 deletions
modules/hyprland
default.nixpackages.nix

4
modules/hyprland/default.nix
View file

@ -7,8 +7,6 @@
}: let
inherit (lib) concatStringsSep optionals;
inherit (config.vars) mainUser;
isNvidia = config.hardware.nvidia.modesetting.enable;
in {
# SYSTEM CONFIG
imports = [
@ -61,7 +59,7 @@ in {
"$XDG_DATA_DIRS"
]}"
]
++ (optionals isNvidia [
++ (optionals config.nvidia.enable [
"LIBVA_DRIVER_NAME, nvidia"
"XDG_SESSION_TYPE, wayland"
"GBM_BACKEND, nvidia-drm"

7
modules/hyprland/packages.nix
View file

@ -4,9 +4,8 @@
pkgs,
...
}: let
inherit (lib) makeLibraryPath optionalString;
inherit (config.vars) mainUser;
isNvidia = config.hardware.nvidia.modesetting.enable;
in {
imports = [../dolphin.nix];
@ -61,8 +60,8 @@ in {
];
buildInputs = [makeWrapper];
postBuild = ''
wrapProgram $out/bin/Discord ${lib.optionalString isNvidia
''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
wrapProgram $out/bin/Discord ${optionalString config.nvidia.enable
''--prefix LD_LIBRARY_PATH : "${makeLibraryPath [
addOpenGLRunpath.driverLink
libglvnd
]}"''} \