diff --git a/machines/configuration.nix b/machines/configuration.nix
index b46d370..86f5d74 100644
--- a/machines/configuration.nix
+++ b/machines/configuration.nix
@@ -27,6 +27,18 @@
 			device = "10.0.10.2:/volume1/system-backups";
 			fsType = "nfs";
 		};
+		"/movies" = {
+			device = "10.0.10.2:/volume1/video/movies";
+			fsType = "nfs";
+		};
+		"/music" = {
+			device = "10.0.10.2:/volume1/music";
+			fsType = "nfs";
+		};
+		"/tvshows" = {
+			device = "10.0.10.2:/volume1/video/tvshows";
+			fsType = "nfs";
+		};
 	};
 
 	environment = {
diff --git a/machines/laptop/default.nix b/machines/laptop/default.nix
index aec1e7b..9fd7570 100644
--- a/machines/laptop/default.nix
+++ b/machines/laptop/default.nix
@@ -8,7 +8,25 @@
 
 	networking.firewall.enable = true;
 	networking.firewall.allowedTCPPorts = [ ];
-	networking.firewall.allowedUDPPorts = [ ];
+	networking.firewall.allowedUDPPorts = [ 51820 ];
+
+	networking.wg-quick.interfaces = {
+		wg0 = {
+			address = [ "10.8.0.4/24" ];
+			dns = [ "10.0.10.20" "10.0.10.1" ];
+			privateKeyFile = "/root/wg-home.privkey";
+
+			peers = [
+				{
+					publicKey = "KRI5BtJHsU9RWvf1syJ8zWkKtH9RMg/R/v88j1IH6iE=";
+					presharedKeyFile = "/root/wg-preshared.key";
+					allowedIPs = [ "0.0.0.0/0" ];
+					endpoint = "vpn.dvdt.dev:51820";
+					persistentKeepalive = 25;
+				}
+			];
+		};
+	};
 
 	hardware.bluetooth.enable = true;
 
@@ -22,4 +40,21 @@
 		
 	boot.initrd.secrets."/crypto_keyfile.bin" = null;
 
+	services.power-profiles-daemon.enable = false;
+	services.thermald.enable = true;
+	services.tlp = {
+		enable = true;
+		settings = {
+			CPU_SCALING_GOVERNOR_ON_AC = "performance";
+			CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+
+			CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+			CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+
+			CPU_MIN_PERF_ON_AC = 0;
+			CPU_MAX_PERF_ON_AC = 100;
+			CPU_MIN_PERF_ON_BAT = 0;
+			CPU_MAX_PERF_ON_BAT = 40;
+		};
+	};
 }