Commit 9b727989dcf5

Vincent Demeester <vincent@sbr.pm>
2017-04-07 14:43:20
Upgrade to 17.03 ๐Ÿ‘ผ ๐Ÿฆ
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 78f79f3
configuration/custom-packages.nix
@@ -10,8 +10,8 @@
 			pinnedPkgs = import (fetchNixPkgs {
 				owner = "NixOS";
 				repo = "nixpkgs-channels";
-				rev = "73a6832ad86755ae4dfb7717b4d1e37b2691fb4f";
-				sha256 = "0dfjkm5gvy5v6dmfh47isfh73j39k3wzw4r1mhvgcm3620vhvzd9";
+				rev = "0a6a06346a3c928a3115dfd700993c5c06b0a1e9";
+				sha256 = "1gk9phpqj9nchkgv22blq8ggwdfyqsr3i55vwpjd8m4qcr5x62zw";
 			}) {};
 			sbrPkgs = import (fetchNixPkgs {
 				owner = "vdemeester";
@@ -20,7 +20,7 @@
 				sha256 = "13g8l66gallqk3gp9ah481zsd569c1rf2ck4kgma652v6wgpxdmz";
 			}) {};
 		in {
-			inherit (pinnedPkgs) keybase ipfs mpv docker-machine docker tini docker-proxy containerd runc doctl vndr emacs ledger-cli;
+			inherit (pinnedPkgs) keybase ipfs mpv docker-machine docker docker-edge tini docker-proxy containerd runc doctl vndr emacs ledger-cli;
 			inherit (sbrPkgs) dobi ape tuck clasp;
 		};
 	};
hardware/thinkpad.nix
@@ -2,7 +2,7 @@
 
 {
 	environment.systemPackages = with pkgs; [
-		linuxPackages_4_8.tp_smapi
+		linuxPackages_4_10.tp_smapi
 	];
 	boot = {
 		kernelParams = [
profiles/audio.nix
@@ -8,7 +8,8 @@
 			package = pkgs.pulseaudioFull;
 		};
 	};
-	sound.enableMediaKeys = true;
+	sound.mediaKeys.enable = true;
+	
 
 	# spotify
 	networking.firewall.allowedTCPPorts = [ 57621 57622 ];
profiles/default.nix
@@ -31,8 +31,14 @@
 	};
 	nix = {
 		useSandbox = true;
+		gc = {
+			automatic = true;
+			dates = "00:30";
+			options = "--delete-older-than 30d";
+		};
 		# if hydra is down, don't wait forever
 		extraOptions = ''
+		    gc-keep-output = true
 		    connect-timeout = 20
 		'';
 	};
@@ -43,7 +49,7 @@
 	};
 
 	system = {
-		stateVersion = "16.09";
+		stateVersion = "17.03";
 		autoUpgrade = {
 			enable = true;
 			dates = "13:00";
profiles/desktop.nix
@@ -13,7 +13,7 @@
 
 	boot.loader.systemd-boot.enable = true;
 	boot.loader.efi.canTouchEfiVariables = true;
-	boot.kernelPackages = pkgs.linuxPackages_4_8;
+	boot.kernelPackages = pkgs.linuxPackages_4_10;
 	boot.tmpOnTmpfs = true;
 
 	environment.systemPackages = with pkgs; [
@@ -39,7 +39,7 @@
 		tuck
 		clasp
 		keybase
-		ipfs
+		# ipfs # something is failing on 17.03
 		mpv
 		ledger
 	];
profiles/dockerization.nix
@@ -10,9 +10,9 @@
 		docker = {
 			enable = true;
 			# experimental = true;
-			socketActivation = false;
+			liveRestore = false;
 			storageDriver = "overlay2";
-			extraOptions = "--label=type=desktop --experimental --init";
+			extraOptions = "--label=type=desktop --experimental --init --debug";
 		};
 	};
 	networking.firewall.trustedInterfaces = [ "docker0" ];
profiles/server.nix
@@ -8,5 +8,5 @@
 	];
 	boot.loader.systemd-boot.enable = true;
 	boot.loader.efi.canTouchEfiVariables = true;
-	boot.kernelPackages = pkgs.linuxPackages_4_8;
+	boot.kernelPackages = pkgs.linuxPackages_4_10;
 }