nullbite/nixfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slab: setup supergfxd in specialisation

Browse Source
This commit is contained in:
NullBite 2024-04-15 11:49:21 -04:00
parent dc7ff4cac7
commit 0fd3f6455b
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
3 changed files with 63 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/slab/configuration.nix
View File

@ -30,6 +30,7 @@
../../system # nixfiles modules ../../system # nixfiles modules
./nvidia-optimus.nix ./nvidia-optimus.nix
./supergfxd.nix
]; ];
specialisation.plasma.configuration = { specialisation.plasma.configuration = {
@ -42,6 +43,8 @@
services.xserver.displayManager.startx.enable = lib.mkForce false; services.xserver.displayManager.startx.enable = lib.mkForce false;
}; };
nixfiles.supergfxd.profile = lib.mkDefault "Integrated";
# who needs a display manager? # who needs a display manager?
services.displayManager.sddm.enable = false; services.displayManager.sddm.enable = false;

1
hosts/slab/nvidia-optimus.nix
View File

@ -7,6 +7,7 @@
nvidia.configuration = { nvidia.configuration = {
system.nixos.tags = [ "NVIDIA" ]; system.nixos.tags = [ "NVIDIA" ];
nixfiles.supergfxd.profile = "Hybrid";
# Load nvidia driver for Xorg and Wayland # Load nvidia driver for Xorg and Wayland
services.xserver.videoDrivers = ["amdgpu" "nvidia"]; services.xserver.videoDrivers = ["amdgpu" "nvidia"];

69
hosts/slab/supergfxd.nix
View File

@ -3,7 +3,7 @@ let
gfx = { gfx = {
Integrated = { Integrated = {
supergfxd = pkgs.writeText "supergfxd-integrated" '' supergfxd = pkgs.writeText "supergfxd-integrated" ''
{ {
"mode": "Integrated", "mode": "Integrated",
"vfio_enable": false, "vfio_enable": false,
"vfio_save": false, "vfio_save": false,
@ -11,25 +11,40 @@ let
"no_logind": false, "no_logind": false,
"logout_timeout_s": 180, "logout_timeout_s": 180,
"hotplug_type": "None" "hotplug_type": "None"
} }
''; '';
# old def (keeping this here just in case
# modprobe = pkgs.writeText "supergfxd-integrated-modprobe" ''
# # Automatically generated by supergfxd
# blacklist nouveau
# alias nouveau off
# blacklist nvidia_drm
# blacklist nvidia_uvm
# blacklist nvidia_modeset
# blacklist nvidia
# alias nvidia off
# options nvidia-drm modeset=1
# '';
modprobe = pkgs.writeText "supergfxd-integrated-modprobe" '' modprobe = pkgs.writeText "supergfxd-integrated-modprobe" ''
# Automatically generated by supergfxd # Automatically generated by supergfxd
blacklist nouveau blacklist nouveau
alias nouveau off blacklist nvidia_drm
blacklist nvidia_drm blacklist nvidia_uvm
blacklist nvidia_uvm blacklist nvidia_modeset
blacklist nvidia_modeset blacklist nvidia
blacklist nvidia install nvidia_uvm /bin/false
alias nvidia off install nvdia_drm /bin/false
install nvidia_modeset /bin/false
options nvidia-drm modeset=1 install nvidia /bin/false
install nouveau /bin/false
options nvidia-drm modeset=1
''; '';
}; };
Hybrid = { Hybrid = {
supergfxd = pkgs.writeText "supergfxd-hybrid" '' supergfxd = pkgs.writeText "supergfxd-hybrid" ''
{ {
"mode": "Hybrid", "mode": "Hybrid",
"vfio_enable": false, "vfio_enable": false,
"vfio_save": false, "vfio_save": false,
@ -37,16 +52,15 @@ options nvidia-drm modeset=1
"no_logind": false, "no_logind": false,
"logout_timeout_s": 180, "logout_timeout_s": 180,
"hotplug_type": "None" "hotplug_type": "None"
} }
''; '';
modprobe = pkgs.writeText "supergfxd-hybrid-modprobe" '' modprobe = pkgs.writeText "supergfxd-hybrid-modprobe" ''
# Automatically generated by supergfxd # Automatically generated by supergfxd
blacklist nouveau blacklist nouveau
alias nouveau off alias nouveau off
options nvidia NVreg_DynamicPowerManagement=0x02 options nvidia NVreg_DynamicPowerManagement=0x02
options nvidia-drm modeset=1
options nvidia-drm modeset=1
''; '';
}; };
}; };
@ -61,17 +75,24 @@ options nvidia-drm modeset=1
in { in {
options = { options = {
nixfiles.supergfxd.profile = mkOption { nixfiles.supergfxd.profile = mkOption {
type = types.str; type = types.nullOr (types.enum (builtins.attrNames gfx));
default = ""; default = null;
example = "Integrated"; example = "Integrated";
description = "supergfxd profile to use"; description = "supergfxd profile to use";
}; };
}; };
config = { config = {
etc = mkIf (!(cfg.profile == "")) { environment.etc = mkIf (!(builtins.isNull cfg.profile)) {
# TODO figure out here how to assert if the value is in the gfx attrset
# TODO actually configure the system settings here # TODO actually configure the system settings here
"supergfxd.conf" = {
source = gfx.${cfg.profile}.supergfxd;
mode = "0644";
};
"modprobe.d/supergfxd.conf" = {
source = gfx.${cfg.profile}.modprobe;
mode = "0644";
};
}; };
}; };
} }