Commit ae049aef5861

Vincent Demeester <vincent@sbr.pm>
2016-12-15 11:57:24
Refactor virtualization to split docker from it :)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 758f438
Changed files (3)
configuration/docker.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, ...}:
+
+{
+	virtualisation = {
+		docker = {
+			enable = true;
+			# experimental = true;
+			socketActivation = false;
+			storageDriver = "overlay2";
+			extraOptions = "--label=type=desktop";
+		};
+	};
+	networking.firewall.trustedInterfaces = [ "docker0" ];
+
+}
configuration/virtualisation.nix
@@ -1,17 +1,14 @@
 { config, pkgs, ... }:
 
 {
+	imports =
+		[
+			docker.nix
+		];
 	virtualisation = {
-		docker = {
-			enable = true;
-			# experimental = true;
-			socketActivation = false;
-			storageDriver = "overlay2";
-			extraOptions = "--label=type=desktop";
-		};
 		virtualbox.host.enable = true;
 	};
-	networking.firewall.trustedInterfaces = [ "docker0" "vboxnet0" ];
+	networking.firewall.trustedInterfaces = [ "vboxnet0" ];
 	environment = {
 		systemPackages = with pkgs; [
 			vagrant
machine/kobe.nix
@@ -7,7 +7,7 @@
 			../configuration/users.nix
 			../configuration/system.nix
 			../configuration/network.nix
-			# ../configuration/docker.nix
+			../configuration/docker.nix
 			../configuration/custom-packages.nix
 			../service/ssh-tunnel.nix
 		];