Commit bb1edbd04406

@@ -12,7 +12,6 @@
 			../profiles/avahi.nix
 			../profiles/syncthing.nix
 			../location/docker.nix
-			../service/containerd.nix
 			../service/ssh-tunnel.nix
 		];
 

@@ -29,30 +29,30 @@
 	
 	hardware.bluetooth.enable = true;
 	services = {
-	openssh = {
-		enable = true;
-		forwardX11 = true;
-	};
-	ssh-tunnel = {
-		enable = true;
-		localUser = "vincent";
-		remoteHostname = "95.85.58.158";
-		remotePort = 22;
-		remoteUser = "vincent";
-		bindPort = 2224;
-	};
-	printing = {
-		enable = true;
-		drivers = [ pkgs.gutenprint ];
-	};
+		openssh = {
+			enable = true;
+			forwardX11 = true;
+		};
+		ssh-tunnel = {
+			enable = true;
+			localUser = "vincent";
+			remoteHostname = "95.85.58.158";
+			remotePort = 22;
+			remoteUser = "vincent";
+			bindPort = 2224;
+		};
+		printing = {
+			enable = true;
+			drivers = [ pkgs.gutenprint ];
+		};
 		xserver = {
 			enable = true;
 			videoDrivers = [ "intel" ];
 			exportConfiguration = true;
 			displayManager.slim.theme = pkgs.fetchurl {
-						url = "https://github.com/vdemeester/slim-themes/raw/master/docker-penguins-theme-0.1.tar.xz";
-						sha256 = "1s0cfj1l9ay7y0ib68dnpdfkr1zwgr0b1s990ch786lxlajwwxpq";
-						};
+				url = "https://github.com/vdemeester/slim-themes/raw/master/docker-penguins-theme-0.1.tar.xz";
+				sha256 = "1s0cfj1l9ay7y0ib68dnpdfkr1zwgr0b1s990ch786lxlajwwxpq";
+			};
 			monitorSection = ''
 	Modeline "2560x1080_60.00"  230.00  2560 2720 2992 3424  1080 1083 1093 1120 -hsync +vsync
 			'';
@@ -70,5 +70,5 @@
 	EndSection
 			'';
 		};
-};
+	};
 }

@@ -9,13 +9,12 @@
 			../profiles/laptop.nix
 			../profiles/ssh.nix
 			../profiles/virtualization.nix
-			# ../profiles/dockerization.nix
+			../profiles/dockerization.nix
 			../service/docker.nix
 			../profiles/dev.nix
 			../profiles/dev.python.nix
 			../location/docker.nix
 			../location/home.nix
-			../service/containerd.nix
 			../hardware/thinkpad-t460s.nix
 		];
 
@@ -37,29 +36,12 @@
 		}
 	];
 
-	# FIXME(vdemeester) remove when containerd module is merged upstream
-	virtualisation = {
-		containerd = {
-			enable = true;
-		};
-		docker-edge = {
-			enable = true;
-			liveRestore = false;
-			storageDriver = "overlay2";
-			extraOptions = "--label=type=desktop --experimental --init --debug --add-runtime docker-runc=${pkgs.runc}/bin/runc --default-runtime=docker-runc --containerd=/run/containerd/containerd.sock";
-		};
-	};
-	networking.firewall.trustedInterfaces = [ "docker0" ];
-
 	hardware.bluetooth.enable = true;
 	hardware.trackpoint.enable = false;
 
 	environment.systemPackages = with pkgs; [
 		autorandr
 		zoom-us
-		# FIXME(vdemeester) remove when containerd module is merged upstream
-		python27Packages.docker_compose
-		docker-machine
 	];
 
 	time.timeZone = "Europe/Paris";

@@ -4,18 +4,22 @@
 {
 	imports = [
 		../service/docker.nix
+		# Remove once containerd module is upstream
+		../service/containerd.nix
 	];
 	environment.systemPackages = with pkgs; [
 		python27Packages.docker_compose
 		docker-machine
 	];
 	virtualisation = {
+		containerd = {
+			enable = true;
+		};
 		docker-edge = {
 			enable = true;
-			# experimental = true;
 			liveRestore = false;
 			storageDriver = "overlay2";
-			extraOptions = "--label=type=desktop --experimental --init --debug";
+			extraOptions = "--label=type=desktop --experimental --init --debug --add-runtime docker-runc=${pkgs.runc}/bin/runc --default-runtime=docker-runc --containerd=/run/containerd/containerd.sock";
 		};
 	};
 	networking.firewall.trustedInterfaces = [ "docker0" ];