Fix up system driver variables

config/home/hyprland.nix

@@ -1,5 +1,5 @@
 { pkgs, config, lib, browser,
-  deviceProfile, wallpaperDir,
+  cpuType, wallpaperDir,
   inputs, ... }:
 
 let
@@ -52,7 +52,7 @@ in with lib; {
       env = QT_WAYLAND_DISABLE_WINDOWDECORATION, 1
       env = QT_AUTO_SCREEN_SCALE_FACTOR, 1
       env = MOZ_ENABLE_WAYLAND, 1
-      ${if deviceProfile == "vm" then ''
+      ${if cpuType == "vm" then ''
         env = WLR_NO_HARDWARE_CURSORS,1
         env = WLR_RENDERER_ALLOW_SOFTWARE,1
       '' else ''

config/scripts/wallsetter.nix

@@ -1,4 +1,4 @@
-{ pkgs, username, wallpaperDir, wallpaperGit, ... }:
+{ pkgs, username, wallpaperDir, wallpaperGit }:
 
 pkgs.writeShellScriptBin "wallsetter" ''
   TIMEOUT=720

config/system/intel-opengl.nix

@@ -1,8 +1,11 @@
-{ pkgs, config, lib, deviceProfile, ... }:
+{ pkgs, config, lib, gpuType, ... }:
 
-lib.mkIf ("${deviceProfile}" == "intel-laptop") {
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+lib.mkIf ("${gpuType}" == "intel") { 
+  nixpkgs.config.packageOverrides =
+    pkgs: {
+      vaapiIntel = pkgs.vaapiIntel.override {
+      enableHybridCodec = true;
+    };
   };
 
   # OpenGL

config/system/services.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, deviceProfile, ... }:
+{ pkgs, config, lib, cpuType, ... }:
 
 {
   # List services that you want to enable:
@@ -30,8 +30,7 @@
   hardware.bluetooth.enable = true; # enables support for Bluetooth
   hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
   services.blueman.enable = true;
-  services.qemuGuest = lib.mkIf ("${deviceProfile}" == "vm") {
+  services.qemuGuest = lib.mkIf ("${cpuType}" == "vm") {
     enable = true;
   };
 }
-

config/system/steam.nix

@@ -7,7 +7,7 @@
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = true;
     package = lib.mkIf ("${cpuType}" == "intel") {
-      pkgs.steam.override {
+      pkgs.steam.override = {
         withPrimus = true;
         extraPkgs = pkgs: [ pkgs.bumblebee pkgs.glxinfo ];
       };

flake.nix

@@ -61,7 +61,7 @@
               inherit inputs; inherit theme;
               inherit browser; inherit wallpaperDir;
               inherit wallpaperGit; inherit flakeDir;
-              inherit deviceProfile;
+              inherit gpuType; inherit cpuType;
               inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme;
             };
 	        home-manager.useGlobalPkgs = true;