diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix
index 28e1dd1..12c7785 100644
--- a/nixos/machines/swarm/configuration.nix
+++ b/nixos/machines/swarm/configuration.nix
@@ -12,7 +12,7 @@
   # Setup nixbuild.net, since this laptop is somewhat under powered
   # programs.ssh.extraConfig = ''
   #   Host eu.nixbuild.net
-  #     PubkeyAcceptedKeyTypes ssh-ed25519
+  #     PubkeyAcceptedKeyTypes ssh-ed255191
   #     ServerAliveInterval 60
   #     IPQoS throughput
   #     IdentityFile /home/nathan/.ssh/id_ed25519
@@ -43,24 +43,16 @@
     };
     distributedBuilds = true;
     buildMachines = [
-      {
-        hostName = "eu.nixbuild.net";
-        system = "x86_64-linux";
-        maxJobs = 100;
-        supportedFeatures = [
-          "benchmark"
-          "big-parallel"
-        ];
-      }
     ];
   };
 
   # Bootloader and plymouth
   boot = {
     loader = {
-      systemd-boot = {
+      grub = {
         enable = true;
-        consoleMode = "auto";
+        device = "nodev";
+        useOSProber = true;
       };
       efi.canTouchEfiVariables = true;
     };
@@ -69,17 +61,6 @@
     };
   };
 
-  # Steam setup
-  programs.steam = {
-    enable = true;
-    gamescopeSession = {
-      enable = true;
-      args = [
-        "--expose-wayland"
-      ];
-    };
-  };
-
   networking.hostName = "swarm"; # Define your hostname.
 
   services.tailscale.enable = true;
@@ -236,15 +217,6 @@
   services.power-profiles-daemon.enable = true;
   services.cpupower-gui.enable = true;
 
-  # Nvidia gpu setup
-  hardware.nvidia = {
-    open = true;
-    prime = {
-      intelBusId = "PCI:0:2:0";
-      nvidiaBusId = "PCI:2:0:0";
-    };
-  };
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/nixos/machines/swarm/machine.nix b/nixos/machines/swarm/machine.nix
index c997e88..426314a 100644
--- a/nixos/machines/swarm/machine.nix
+++ b/nixos/machines/swarm/machine.nix
@@ -35,7 +35,8 @@
                 inputs.nixos-hardware.nixosModules.common-pc-laptop
                 inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
                 inputs.nixos-hardware.nixosModules.common-cpu-intel
-                inputs.nixos-hardware.nixosModules.common-gpu-nvidia
+                # Disable the dGPU
+                inputs.nixos-hardware.nixosModules.common-gpu-nvidia-disable
                 # Our modules
                 (import ../../modules/base.nix {inherit inputs;})
                 (import ../../modules/desktop.nix)