diff --git a/hosts/cnixpad/modules.nix b/hosts/cnixpad/modules.nix
index f374b343..4fb860a1 100644
--- a/hosts/cnixpad/modules.nix
+++ b/hosts/cnixpad/modules.nix
@@ -16,23 +16,6 @@
         extraBlacklistedModules = [];
       };
     };
-    gaming = {
-      steam = {
-        enable = false;
-      };
-      gamescope = {
-        enable = false;
-      };
-      lutris = {
-        enable = false;
-      };
-      gamemode = {
-        enable = false;
-        optimizeGpu = {
-          enable = false;
-        };
-      };
-    };
     gui = {
       gnome = {
         enable = false;
@@ -70,15 +53,6 @@
         };
       };
     };
-    nix = {
-      nh = {
-        enable = true;
-        clean = {
-          enable = true;
-          extraArgs = "--keep 3 --keep-since 21d";
-        };
-      };
-    };
     studio = {
       blender = {
         enable = false;
@@ -132,10 +106,6 @@
         dconf = {
           enable = true;
         };
-        xserver = {
-          videoDrivers = ["amdgpu"];
-          xkbLayout = "se";
-        };
       };
       system = {
         fwupd = {
@@ -198,6 +168,13 @@
         enable = true;
         desktop.enable = false;
       };
+      nh = {
+        enable = true;
+        clean = {
+          enable = true;
+          extraArgs = "--keep 3 --keep-since 21d";
+        };
+      };
       npm = {
         enable = true;
       };
diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix
index e290beca..8edecf65 100644
--- a/hosts/toothpc/modules.nix
+++ b/hosts/toothpc/modules.nix
@@ -2,8 +2,12 @@
   system = {
     boot = {
       loader = {
-        default.enable = false;
-        lanzaboote.enable = true;
+        default = {
+          enable = false;
+        };
+        lanzaboote = {
+          enable = true;
+        };
       };
       kernel = {
         variant = "stable";
@@ -13,12 +17,12 @@
       };
     };
     gaming = {
-      steam = {
-        enable = true;
-      };
-      gamescope = {
-        enable = true;
-      };
+      # steam = {
+      #   enable = true;
+      # };
+      # gamescope = {
+      #   enable = true;
+      # };
       lutris = {
         enable = true;
       };
@@ -67,15 +71,6 @@
         };
       };
     };
-    nix = {
-      nh = {
-        enable = true;
-        clean = {
-          enable = true;
-          extraArgs = "--keep 3 --keep-since 21d";
-        };
-      };
-    };
     studio = {
       blender = {
         enable = false;
@@ -192,6 +187,13 @@
         enable = true;
         desktop.enable = true;
       };
+      nh = {
+        enable = true;
+        clean = {
+          enable = true;
+          extraArgs = "--keep 3 --keep-since 21d";
+        };
+      };
       npm = {
         enable = true;
       };