Commit 27a6c6a603f8

Vincent Demeester <vincent@sbr.pm>
2018-01-22 22:00:54
Fix some things
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent 1745158
Changed files (3)
configuration/custom-packages.nix
@@ -7,11 +7,11 @@
 				fetchFromGitHub {
 					inherit sha256 rev owner repo;
 				};
-			masterUnstablePkgs = import (fetchNixPkgs {
+			dockerUnstablePkgs = import (fetchNixPkgs {
 				owner = "NixOS";
-				repo = "nixpkgs";
-				rev = "9c048f4fb66adc33c6b379f2edefcb615fd53de6";
-				sha256 = "18xbnfzj753bphzmgp74rn9is4n5ir4mvb4gp9lgpqrbfyy5dl2j";
+				repo = "nixpkgs-channels";
+				rev = "a6dca0427221d7c249a9b6f1581cf0d73baf51da";
+				sha256 = "15fcl29a97f68j1pjywmrjm31rdh1a21jz9airlsbzpl4lc3zhfi";
 			}) {};
 			# nixos-unstable
 			unstablePkgs = import (fetchNixPkgs {
@@ -27,9 +27,8 @@
 				sha256 = "0636k102vw1pmbcch75xvhjlkfk9553bcf6rba5i69m7b5bdsfd0";
 			}) {};
 		in {
-			inherit (masterUnstablePkgs) docker docker-edge docker-proxy containerd runc tini;
-			inherit (unstablePkgs) keybase ipfs mpv docker-compose docker-machine doctl vndr emacs ledger-cli youtube-dl go hasklig i3lock-color certstrap pipenv;
-			#inherit (unstablePkgs) keybase ipfs mpv docker-compose docker-machine doctl vndr emacs ledger-cli firefox google-chrome-stable youtube-dl go hasklig i3lock-color certstrap;
+			inherit (dockerUnstablePkgs) docker docker-edge docker-proxy containerd runc tini docker-compose docker-machine;
+			inherit (unstablePkgs) keybase ipfs mpv doctl vndr emacs ledger-cli youtube-dl go hasklig i3lock-color certstrap pipenv;
 			inherit (sbrPkgs) dobi ape tuck clasp;
 		};
 	};
machine/wakasu.nix
@@ -40,6 +40,7 @@
 
 	environment.systemPackages = with pkgs; [
 		autorandr
+		zoom-us
 	];
 
 	time.timeZone = "Europe/Paris";
profiles/desktop.nix
@@ -170,26 +170,6 @@ ${pkgs.xss-lock}/bin/xss-lock --ignore-sleep i3lock-color -- --clock -i $HOME/.b
 		}
 	});
 	'';
-	# Auto commit some repositories
-	systemd.user.services.ggasy = {
-		description = "Auto commit some git annex repository";
-		wantedBy = [ "multi-user.target" ];
-		serviceConfig = {
-			Type = "oneshot";
-			ExecStart = "/run/current-system/sw/bin/git-annex sync";
-			WorkingDirectory="/home/vincent/desktop/org/";
-			Environment = "PATH=/run/current-system/sw/bin";
-		};
-	};
-	systemd.user.timers.ggasy = {
-		description = "Auto commit hourly";
-		wantedBy = [ "timers.target" ];
-		timerConfig = {
-			OnCalendar = "hourly";
-			Persistent = "true";
-		};
-	};
-	systemd.user.timers.ggasy.enable = true;
 	# Auto refresh nix-channel each day
 	systemd.user.services.channel-update = {
 		description = "Update nix-channel daily";