diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
index 50919e1..36a70b1 100644
--- a/modules/nixos/system/default.nix
+++ b/modules/nixos/system/default.nix
@@ -1,5 +1,5 @@
 { config, lib, ... }: {
-  imports = [ ./dbus ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
+  imports = [ ./dbus ./docs ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
 
   services.journald.extraConfig = ''
     SystemMaxUse=512M
diff --git a/modules/nixos/system/docs/default.nix b/modules/nixos/system/docs/default.nix
new file mode 100644
index 0000000..b41a1a0
--- /dev/null
+++ b/modules/nixos/system/docs/default.nix
@@ -0,0 +1,14 @@
+{ config, lib, ... }:
+let
+  cfg = config.syscfg.make;
+  withDocs = cfg.gui || cfg.develop || cfg.serverExtras;
+in
+{
+  documentation = lib.mkIf (!withDocs) {
+    enable = false;
+    man.enable = false;
+    info.enable = false;
+    doc.enable = false;
+    nixos.enable = false;
+  };
+}
diff --git a/modules/nixos/system/nix/default.nix b/modules/nixos/system/nix/default.nix
index 883aa78..75f33d5 100644
--- a/modules/nixos/system/nix/default.nix
+++ b/modules/nixos/system/nix/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }: {
+{ config, inputs, lib, pkgs, ... }: {
   nixpkgs.config = {
     permittedInsecurePackages = [ ];
     allowUnfree = true;
@@ -33,7 +33,9 @@
       ];
     };
   };
-  programs.nix-ld = {
+  programs.nix-ld = lib.mkIf (
+    config.syscfg.make.gui || config.syscfg.make.develop || config.syscfg.make.serverExtras
+  ) {
     enable = true;
     libraries = with pkgs; [
       libx11 libxcb libxi libxext libxkbfile xcbutilcursor
diff --git a/systems/gateway/default.nix b/systems/gateway/default.nix
index 94edb3a..cbe1713 100644
--- a/systems/gateway/default.nix
+++ b/systems/gateway/default.nix
@@ -17,4 +17,9 @@
     10.10.1.2     avalon.helcel.net
   '';
 
+  swapDevices = [ {
+    device = "/swapfile";
+    size = 2 * 1024; # Size in megabytes (4 GB)
+  } ];
+
 }