Commit 514f31b32884

Vincent Demeester <vincent@sbr.pm>
2018-04-29 21:38:40
Tidying things down…
… removing some duplication, clean honshu and hokkaido a bit. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 6cd9b87
machine/hokkaido.nix
@@ -14,9 +14,6 @@
 		];
 
 	time.timeZone = "Europe/Paris";
-	boot.loader.systemd-boot.enable = true;
-
-	services.openssh.enable = true;
 
 	networking.enableIPv6 = false;
 	networking.firewall.allowedTCPPorts = [ 80 443 2375 8384 ];
@@ -25,7 +22,7 @@
     imports = [ ../envs/hokkaido.nix ../envs/server.nix ];
   };
 
-	virtualisation.docker = {
+  virtualisation.docker = {
 		enable = true;
 		package = pkgs.docker-edge;
 		storageDriver = "overlay2";
machine/honshu.nix
@@ -8,23 +8,24 @@
 			../profiles/server.nix
 			../profiles/dev.python.nix
 			../profiles/dev.go.nix
-			../profiles/dockerization.nix
 			../location/home.nix
 			../service/ssh-tunnel.nix
 		];
 
 	time.timeZone = "Europe/Paris";
-	boot.loader.systemd-boot.enable = true;
 
   home-manager.users.vincent = {...}: {
     imports = [ ../envs/honshu.nix ../envs/server.nix ];
   };
-
+  
+  virtualisation.docker = {
+		enable = true;
+		package = pkgs.docker-edge;
+		storageDriver = "overlay2";
+		extraOptions = "--experimental --host=tcp://0.0.0.0:2375";
+	};
 	services = {
-		openssh = {
-			enable = true;
-		};
-		ssh-tunnel = {
+    ssh-tunnel = {
 			enable = true;
 			localUser = "vincent";
 			remoteHostname = "95.85.58.158";
@@ -33,5 +34,7 @@
 			bindPort = 2224;
 		};
 	};
+  
+	networking.enableIPv6 = false;
 	networking.firewall.allowedTCPPorts = [ 3389 2375 ];
 }
machine/wakasu.nix
@@ -25,7 +25,6 @@
     imports = [ ../envs/wakasu.nix ../envs/dev.nix ../envs/laptop.nix ];
   };
 
-  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.initrd.luks.devices = [
     {
profiles/dev.go.nix
@@ -2,8 +2,7 @@
 { configs, pkgs, ...}:
 
 {
-	imports = 
-	[
+	imports = [
 		./dev.nix
 	];
   environment.systemPackages = with pkgs; [
profiles/dev.python.nix
@@ -3,10 +3,9 @@
 { configs, pkgs, ...}:
 
 {
-	imports = 
-		[
-			./dev.nix
-		];
+	imports = [
+		./dev.nix
+	];
 	environment.systemPackages = with pkgs; [
 		python3
 		pipenv
profiles/ssh.nix
@@ -2,5 +2,4 @@
 
 {
 	services.openssh.enable = true;
-	services.openssh.startWhenNeeded = true;
 }