auxolotl/templates
20
2
Fork 4
Code Issues 3 Pull requests 2 Actions Packages Projects Releases Wiki Activity

Compare commits

base: auxolotl:33efba78de7029805472199c679fba7c772de26a
Branches Tags
auxolotl:main
auxolotl:new-user-templates
auxolotl:chore/inputs
..
compare: auxolotl:2ad489545493853aefcd285123b6b8d10908b9b1
Branches Tags
auxolotl:main
auxolotl:new-user-templates
auxolotl:chore/inputs

15 commits
33efba78de ... 2ad4895454

Author SHA1 Message Date
Andre 2ad4895454 refactor(system): fix conflicts between desktop environment login managers
Some checks failed
Code Check / Run nixfmt and statix (push) Has been cancelled
Details
Code Check / Run nixfmt and statix (pull_request) Has been cancelled
Details
2024-06-30 13:18:46 -04:00
Andre 12fe9fd0b9 fix(system): fix aux.system.ui.desktops namespacing in desktop and flatpak modules 2024-06-30 13:18:46 -04:00
Andre f77c7ca594 fix(system): add initrd settings for tpm2 2024-06-30 13:18:46 -04:00
Andre 09d5cd2c8a chore(system): update video driver syntax to match upstream 2024-06-30 13:18:46 -04:00
Andre 786dd6a991 refactor(system): simplify Nix config file 2024-06-30 13:18:46 -04:00
Andre c1b638a61b fix(system): remove lingering reference to auxlibs 
feat(system): re-add Totem to Gnome installs
 2024-06-30 13:18:46 -04:00
Andre 2507e0b794 feat(system): Use Lix in place of Nix in new user template 2024-06-30 13:18:46 -04:00
Andre 40372d3a9e chore(system): Cleanup template readme and options 2024-06-30 13:18:46 -04:00
Andre 971fc26b06 fix(system): fix funky unicode quotes 2024-06-30 13:18:46 -04:00
Andre 3547412cf1 chore(system): remove Aux libs as they're still in Labs 2024-06-30 13:18:46 -04:00
Andre 857679a823 feat(system): add Flatpak support 
chore(system): replace test data with abort messages
 2024-06-30 13:18:46 -04:00
Andre 20cccae696 feat(system): Add Nvidia, Intel, and AMD GPU support to new user template 
chore(system): update top-level Readme file
 2024-06-30 13:18:46 -04:00
Andre 6cb8713207 chore(system): Change template namespace from 'aux' to 'aux.system' 2024-06-30 13:18:46 -04:00
Andre 2bf23a5cfa feat(system): add modules for bluetooth, networking, system config, Budgie, Hyprland, and XFCE to system template 
fix(system): re-enable abort conditions in new user template
 2024-06-30 13:18:46 -04:00
Andre 3455919041 feat(system): initial commit for new user system templates 2024-06-30 13:18:36 -04:00
1 changed files with 4 additions and 4 deletions
Show stats Expand all files Collapse all files

8
system/modules/system/gpu/nvidia.nix
View file

@ -45,11 +45,11 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
assertions = [ assertions = [
{ {
assertion = (cfg.hybrid.busIDs.nvidia != ""); assertion = (cfg.busIDs.nvidia == "");
message = "You need to define a bus ID for your Nvidia GPU. To learn how to find the bus ID, see https://nixos.wiki/wiki/Nvidia#Configuring_Optimus_PRIME:_Bus_ID_Values_.28Mandatory.29."; message = "You need to define a bus ID for your Nvidia GPU. To learn how to find the bus ID, see https://nixos.wiki/wiki/Nvidia#Configuring_Optimus_PRIME:_Bus_ID_Values_.28Mandatory.29.";
} }
{ {
assertion = (cfg.hybrid.busIDs.intel != "" || cfg.busIDs.amd != ""); assertion = (cfg.busIDs.intel == "" && cfg.busIDs.amd == "");
message = "You need to define a bus ID for your non-Nvidia GPU. To learn how to find your bus ID, see https://nixos.wiki/wiki/Nvidia#Configuring_Optimus_PRIME:_Bus_ID_Values_.28Mandatory.29."; message = "You need to define a bus ID for your non-Nvidia GPU. To learn how to find your bus ID, see https://nixos.wiki/wiki/Nvidia#Configuring_Optimus_PRIME:_Bus_ID_Values_.28Mandatory.29.";
} }
]; ];
@ -73,8 +73,8 @@ in
sync.enable = lib.mkIf cfg.hybrid.sync true; sync.enable = lib.mkIf cfg.hybrid.sync true;
nvidiaBusId = cfg.hybrid.busIDs.nvidia; nvidiaBusId = cfg.hybrid.busIDs.nvidia;
intelBusId = cfg.hybrid.busIDs.intel; intelBusId = lib.mkIf (cfg.hybrid.busIDs.intel != "") cfg.hybrid.busIDs.intel;
amdgpuBusId = cfg.hybrid.busIDs.amd; amdgpuBusId = lib.mkIf (cfg.hybrid.busIDs.amd != "") cfg.hybrid.busIDs.amd;
}; };
}; };
}; };