diff --git a/home-manager/machines/crash/home.nix b/home-manager/machines/crash/home.nix
index a1a3b1d..1386d8f 100644
--- a/home-manager/machines/crash/home.nix
+++ b/home-manager/machines/crash/home.nix
@@ -35,6 +35,7 @@
                 (import ../../modules/programs/emacs.nix {})
                 ../../modules/programs/fonts.nix
                 ../../modules/programs/desktop.nix
+                ../../modules/programs/games.nix
               ];
               home.username = "nathan";
               home.homeDirectory = "/home/nathan/";
@@ -59,6 +60,14 @@
                   Service.ExecStart = lib.mkForce "${pkgs.syncthingtray}/bin/syncthingtray --wait";
                 };
               };
+
+              home.packages = with pkgs; [
+                # Stylus note taking
+                xournalpp
+                rnote
+                # System monitoring
+                nvtopPackages.full
+              ];
             }
           )
         ];
diff --git a/home-manager/modules/programs/games.nix b/home-manager/modules/programs/games.nix
new file mode 100644
index 0000000..b534464
--- /dev/null
+++ b/home-manager/modules/programs/games.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs',
+  ...
+}: {
+  home.packages = with pkgs; [
+    # Minecraft
+    prismlauncher
+    zulu
+    glfw3-minecraft
+  ];
+}
diff --git a/nixos/machines/crash/configuration.nix b/nixos/machines/crash/configuration.nix
index c1a0e76..2b9fb75 100644
--- a/nixos/machines/crash/configuration.nix
+++ b/nixos/machines/crash/configuration.nix
@@ -154,11 +154,52 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    # Touch stuff
     libinput
     maliit-keyboard
     dconf-editor
+    surface-control
   ];
 
+  # Setup iptsd for touch and stylus support
+  services.iptsd = {
+    enable = true;
+    config.Touchscreen = {
+      DisableOnPalm = true;
+      DisableOnStylus = true;
+    };
+  };
+
+  # And thermald
+  services.thermald = {
+    enable = true;
+  };
+
+  # Other power saving goodies
+  hardware.enableAllFirmware = true;
+  services.tlp = {
+    enable = true;
+    settings = {
+      CPU_SCALING_GOVERNOR_ON_AC = "performance";
+      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+
+      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+      CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+    };
+  };
+  powerManagement.enable = true;
+  services.power-profiles-daemon.enable = false;
+  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/crash/machine.nix b/nixos/machines/crash/machine.nix
index 53690f9..c8f453d 100644
--- a/nixos/machines/crash/machine.nix
+++ b/nixos/machines/crash/machine.nix
@@ -31,6 +31,11 @@
               imports = [
                 # Hardware support
                 inputs.nixos-hardware.nixosModules.microsoft-surface-common
+                inputs.nixos-hardware.nixosModules.common-pc
+                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
                 # Our modules
                 (import ../../modules/base.nix {inherit inputs;})
                 (import ./configuration.nix)