hosts/Dimaga/default.nix

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

hosts/Dimaga/hardware-configuration.nix

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

modules/system/gpu/nvidia.nix

@@ -45,11 +45,11 @@ in
   config = lib.mkIf cfg.enable {
     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.";
       }
       {
-        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.";
       }
     ];