Fix up system driver variables

This commit is contained in:
Tyler Kelley 2024-01-23 18:18:39 -06:00
parent c1179e4a9b
commit 5520971b43
6 changed files with 14 additions and 12 deletions

View File

@ -1,5 +1,5 @@
{ pkgs, config, lib, browser, { pkgs, config, lib, browser,
deviceProfile, wallpaperDir, cpuType, wallpaperDir,
inputs, ... }: inputs, ... }:
let let
@ -52,7 +52,7 @@ in with lib; {
env = QT_WAYLAND_DISABLE_WINDOWDECORATION, 1 env = QT_WAYLAND_DISABLE_WINDOWDECORATION, 1
env = QT_AUTO_SCREEN_SCALE_FACTOR, 1 env = QT_AUTO_SCREEN_SCALE_FACTOR, 1
env = MOZ_ENABLE_WAYLAND, 1 env = MOZ_ENABLE_WAYLAND, 1
${if deviceProfile == "vm" then '' ${if cpuType == "vm" then ''
env = WLR_NO_HARDWARE_CURSORS,1 env = WLR_NO_HARDWARE_CURSORS,1
env = WLR_RENDERER_ALLOW_SOFTWARE,1 env = WLR_RENDERER_ALLOW_SOFTWARE,1
'' else '' '' else ''

View File

@ -1,4 +1,4 @@
{ pkgs, username, wallpaperDir, wallpaperGit, ... }: { pkgs, username, wallpaperDir, wallpaperGit }:
pkgs.writeShellScriptBin "wallsetter" '' pkgs.writeShellScriptBin "wallsetter" ''
TIMEOUT=720 TIMEOUT=720

View File

@ -1,8 +1,11 @@
{ pkgs, config, lib, deviceProfile, ... }: { pkgs, config, lib, gpuType, ... }:
lib.mkIf ("${deviceProfile}" == "intel-laptop") { lib.mkIf ("${gpuType}" == "intel") {
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides =
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; pkgs: {
vaapiIntel = pkgs.vaapiIntel.override {
enableHybridCodec = true;
};
}; };
# OpenGL # OpenGL

View File

@ -1,4 +1,4 @@
{ pkgs, config, lib, deviceProfile, ... }: { pkgs, config, lib, cpuType, ... }:
{ {
# List services that you want to enable: # List services that you want to enable:
@ -30,8 +30,7 @@
hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.enable = true; # enables support for Bluetooth
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
services.blueman.enable = true; services.blueman.enable = true;
services.qemuGuest = lib.mkIf ("${deviceProfile}" == "vm") { services.qemuGuest = lib.mkIf ("${cpuType}" == "vm") {
enable = true; enable = true;
}; };
} }

View File

@ -7,7 +7,7 @@
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
package = lib.mkIf ("${cpuType}" == "intel") { package = lib.mkIf ("${cpuType}" == "intel") {
pkgs.steam.override { pkgs.steam.override = {
withPrimus = true; withPrimus = true;
extraPkgs = pkgs: [ pkgs.bumblebee pkgs.glxinfo ]; extraPkgs = pkgs: [ pkgs.bumblebee pkgs.glxinfo ];
}; };

View File

@ -61,7 +61,7 @@
inherit inputs; inherit theme; inherit inputs; inherit theme;
inherit browser; inherit wallpaperDir; inherit browser; inherit wallpaperDir;
inherit wallpaperGit; inherit flakeDir; inherit wallpaperGit; inherit flakeDir;
inherit deviceProfile; inherit gpuType; inherit cpuType;
inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme; inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme;
}; };
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;