chn: xserver drivers to per host basis

This commit is contained in:
2026-09-29 18:25:19 +02:00
parent 8f4ad18cc8
commit b131b2ad3c
5 changed files with 41 additions and 11 deletions

View File

@@ -21,6 +21,5 @@
steam steam
]; ];
# explicitly override videoDrivers (nvidia doesnt like us on nixbook ) services.xserver.videoDrivers = [ "intel" ];
services.xserver.videoDrivers = lib.mkForce [ "intel" ];
} }

View File

@@ -1,4 +1,3 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
{ {
@@ -7,20 +6,27 @@
../../modules ../../modules
./gaming.nix ./gaming.nix
./wireguard.nix ./wireguard.nix
./nvidia.nix
]; ];
networking.hostName = "tuxcomp"; networking.hostName = "tuxcomp";
system.stateVersion = "26.05"; system.stateVersion = "26.05";
hardware.tuxedo-rs = {
enable = true;
tailor-gui.enable = true;
};
hardware.tuxedo-drivers.enable = true;
# adds a `stretch_aspect` scaler (Valve/gamescope#927) and lets `--rt` use the # adds a `stretch_aspect` scaler (Valve/gamescope#927) and lets `--rt` use the
# rtprio limit from modules/gaming.nix instead of CAP_SYS_NICE. # rtprio limit from modules/gaming.nix instead of CAP_SYS_NICE.
#nixpkgs.overlays = [ # nixpkgs.overlays = [
# (_final: prev: { # (_final: prev: {
# gamescope = prev.gamescope.overrideAttrs (old: { # gamescope = prev.gamescope.overrideAttrs (old: {
# patches = (old.patches or [ ]) ++ [ ../../patches/gamescope-stretch-aspect.patch ]; # patches = (old.patches or [ ]) ++ [ ../../patches/gamescope-stretch-aspect.patch ];
# }); # });
# }) # })
#]; # ];
} }

20
hosts/tuxcomp/nvidia.nix Normal file
View File

@@ -0,0 +1,20 @@
{ lib, ... }:
{
services.xserver.videoDrivers = lib.mkForce [
"nvidia"
"amdgpu"
];
hardware.nvidia.prime = {
reverseSync.enable = true;
amdgpuBusId = "PCI:6@0:0:0";
nvidiaBusId = "PCI:1@0:0:0";
};
hardware.nvidia = {
open = true;
modesetting.enable = true;
nvidiaSettings = true;
};
}

View File

@@ -29,6 +29,7 @@
zathura zathura
# media # media
exiftool
feh feh
feishin # TODO: inject my patches / use my version feishin # TODO: inject my patches / use my version
ffmpeg ffmpeg
@@ -39,6 +40,7 @@
puddletag puddletag
# tools # tools
appimage-run
fastfetch fastfetch
gparted gparted
ranger ranger
@@ -47,5 +49,11 @@
unrar unrar
unzip unzip
zip zip
fzf
]; ];
programs.appimage = {
enable = true;
binfmt = true;
};
} }

View File

@@ -1,19 +1,15 @@
{ pkgs, inputs, ... }: { pkgs, inputs, ... }:
{ {
services.displayManager.gdm.enable = true; # TODO: look into ly/greetd/something less heavy services.displayManager.sddm.enable = true; # TODO: look into ly/greetd/something less heavy
services.displayManager.autoLogin = { services.displayManager.autoLogin = {
enable = true; enable = true;
user = "djai"; user = "djai";
}; };
# note that we set the videodrivers on a per-host basis, so not here.
services.xserver = { services.xserver = {
enable = true; enable = true;
videoDrivers = [
"nvidia"
"amdgpu"
"intel"
];
xkb = { xkb = {
layout = "us"; layout = "us";
variant = "euro"; variant = "euro";
@@ -53,6 +49,7 @@
waybar waybar
wl-clipboard wl-clipboard
wl-clipboard-x11 wl-clipboard-x11
swaybg
]; ];
# TODO: qt theming # TODO: qt theming