Commit 9766057ac3a3

@@ -6,9 +6,11 @@
 {
 	imports =
 		[
+			./system.nix
 			./keyboard.nix
                         ./acpi.nix
 			./network.nix
+			./network-gui.nix
 			./audio.nix
 			./gui.nix
 			./virtualisation.nix

@@ -0,0 +1,15 @@
+{ config, pkgs, ... }:
+
+{
+	networking.networkmanager.enable = true;
+
+	environment.systemPackages = with pkgs; [
+		networkmanagerapplet
+	];
+
+	services.avahi = {
+		enable = true;
+		nssmdns = true;
+		publish.enable = true;
+	};
+}

@@ -1,18 +1,6 @@
 { config, pkgs, ... }:
 
 {
-	networking.networkmanager.enable = true;
-
-	environment.systemPackages = with pkgs; [
-		networkmanagerapplet
-	];
-
 	services.openssh.enable = true;
 	services.openssh.startWhenNeeded = true;
-
-	services.avahi = {
-		enable = true;
-		nssmdns = true;
-		publish.enable = true;
-	};
 }

@@ -1,9 +1,6 @@
 { config, pkgs, ... }:
 
 {
-	programs = {
-		 zsh.enable = true;
-	};
 	environment = {
 		variables = {
 			EDITOR = pkgs.lib.mkOverride 0 "vim";

@@ -0,0 +1,31 @@
+
+{ configs, pkgs, ...}:
+
+{
+	boot.loader.systemd-boot.enable = true;
+	boot.loader.efi.canTouchEfiVariables = true;
+	boot.kernelPackages = pkgs.linuxPackages_4_8;
+
+	time.timeZone = "Europe/Paris";
+
+	system = {
+		stateVersion = "16.09";	
+		autoUpgrade = {
+			enable = true;
+			dates = "13:00";
+		};
+	};
+
+	nix = {
+		useSandbox = true;
+		# if hydra is down, don't wait forever
+		extraOptions = ''
+		    connect-timeout = 20
+		'';
+	};
+	nixpkgs = {
+		config = {
+			allowUnfree = true;
+		};
+	};
+}

@@ -1,6 +1,9 @@
 { config, pkgs, ... }:
 
 {
+	programs = {
+		 zsh.enable = true;
+	};
 	users = {
 		extraUsers = {
 			vincent = {

@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{
+	imports =
+		[ # Include the results of the hardware scan.
+			../hardware-configuration.nix
+			../configuration/users.nix
+			../configuration/system.nix
+			../configuration/network.nix
+			# ../configuration/docker.nix
+			../configuration/custom-packages.nix
+		];
+
+	networking.hostName = "kobe";
+
+}