aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

Compare commits

base: aires:bedfbf991b4bf69b058bff3fc40c6f288f6628d5
Branches Tags
aires:main
aires:aux-template
..
compare: aires:c3589b3a73cbd5d463b77d67672d2ed2e4cd990c
Branches Tags
aires:main
aires:aux-template

No commits in common. "bedfbf991b4bf69b058bff3fc40c6f288f6628d5" and "c3589b3a73cbd5d463b77d67672d2ed2e4cd990c" have entirely different histories.
bedfbf991b ... c3589b3a73

3 changed files with 19 additions and 19 deletions
Show stats Expand all files Collapse all files

20
hosts/Dimaga/default.nix
View file

@ -28,17 +28,17 @@ in
apps = { apps = {
development.enable = true; development.enable = true;
#media.enable = true; media.enable = true;
#office.enable = true; office.enable = true;
#recording.enable = true; recording.enable = true;
#social.enable = true; social.enable = true;
#writing.enable = true; writing.enable = true;
}; };
# Enable Secure Boot support. # Enable Secure Boot support.
bootloader = { bootloader = {
enable = true; enable = true;
#secureboot.enable = true; secureboot.enable = true;
tpm2.enable = true; tpm2.enable = true;
}; };
@ -49,11 +49,11 @@ in
gpu = { gpu = {
intel.enable = true; intel.enable = true;
nvidia = { nvidia = {
enable = true; enable = false;
hybrid = { hybrid = {
enable = true; enable = false;
busIDs.nvidia = "PCI:3:0:0"; busIDs.nvidia = "";
busIDs.intel = "PCI:0:2:0"; busIDs.intel = "";
}; };
}; };
}; };

14
hosts/Dimaga/hardware-configuration.nix
View file

@ -7,8 +7,8 @@
}: }:
let let
luksPartition = "/dev/disk/by-uuid/dfb4fc8f-e82b-43a1-91c1-a77acb6337cb"; primaryDisk = "/dev/disk/by-id/";
luksDevice = "9fdc521b-a037-4070-af47-f54da03675e4"; luksDevice = "";
standardMountOpts = [ standardMountOpts = [
"compress=zstd" "compress=zstd"
"noatime" "noatime"
@ -37,27 +37,27 @@ in
fileSystems = { fileSystems = {
"/" = { "/" = {
device = luksPartition; device = primaryDisk;
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@" ] ++ standardMountOpts; options = [ "subvol=@" ] ++ standardMountOpts;
}; };
"/home" = { "/home" = {
device = luksPartition; device = primaryDisk;
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@home" ] ++ standardMountOpts; options = [ "subvol=@home" ] ++ standardMountOpts;
}; };
"/nix" = { "/nix" = {
device = luksPartition; device = primaryDisk;
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@nix" ] ++ standardMountOpts; options = [ "subvol=@nix" ] ++ standardMountOpts;
}; };
"/swap" = { "/swap" = {
device = luksPartition; device = primaryDisk;
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@swap" ]; options = [ "subvol=@swap" ];
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/FC20-D155"; device = "/dev/disk/by-uuid/AFCB-D880";
fsType = "vfat"; fsType = "vfat";
}; };
}; };

4
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.hybrid.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.";
} }
]; ];