diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index 09c5437..8f28c01 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -172,6 +172,16 @@
         LidSwitchIgnoreInhibited = no
     '';
 
+    services.earlyoom = {
+        enable = true;
+        enableNotifications = true;
+    };
+
+    swapDevices = [{
+        device = "/swapfile";
+        size = 16 * 1024;
+    }];
+
     # This value determines the NixOS release from which the default
     # settings for stateful data, like file locations and database versions
     # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/x270.nix b/hosts/x270.nix
index 70b3ef0..30f75e8 100644
--- a/hosts/x270.nix
+++ b/hosts/x270.nix
@@ -6,6 +6,17 @@
         speed = 170;
     };
 
+    # Ensure that trackpoint mouse buttons work after suspend without having
+    # to touch the trackpoint first
+    powerManagement = {
+        powerDownCommands = ''
+            modprobe -r psmouse
+        '';
+        resumeCommands = ''
+            modprobe psmouse
+        '';
+    };
+
     services.xserver.videoDrivers = [ "modesetting" ];
 
     boot.initrd.kernelModules = [ "i915" ];