From 3dbb0294269666954a5e7ffa24342c4ad20bbb03 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 6 Jun 2016 22:15:20 +0200 Subject: l 2: bump nixpkgs f632f8e -> 5ae35cd --- lass/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 1c06acf38..5cb2614a8 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -57,7 +57,7 @@ with config.krebs.lib; stockholm = "/home/lass/stockholm"; nixpkgs = { url = https://github.com/lassulus/nixpkgs; - rev = "f632f8edaf80ffa8bf0b8c9b9064cae3ccbe3894"; + rev = "5ae35cd00571033901c424001c3878f5974f4992"; dev = "/home/lass/src/nixpkgs"; }; } // optionalAttrs config.krebs.build.host.secure { -- cgit v1.2.3 From 8c1257facc7b599dd62a730cf35370d68ff8799b Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 7 Jun 2016 20:04:36 +0200 Subject: l 2: bump nixpkgs 5ae35cd -> 2e971b0 --- lass/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 5cb2614a8..aa37b8e6b 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -57,7 +57,7 @@ with config.krebs.lib; stockholm = "/home/lass/stockholm"; nixpkgs = { url = https://github.com/lassulus/nixpkgs; - rev = "5ae35cd00571033901c424001c3878f5974f4992"; + rev = "2e971b07db3fb77e0590fff09d0b9cb086159caa"; dev = "/home/lass/src/nixpkgs"; }; } // optionalAttrs config.krebs.build.host.secure { -- cgit v1.2.3 From 82f811474c036daff9b29a4ee1e89784dc781cc9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 8 Jun 2016 18:23:02 +0200 Subject: l 2: activate prism as binary-cache --- lass/2configs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index aa37b8e6b..ce42a1ffa 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -40,6 +40,12 @@ with config.krebs.lib; }; }; } + { + nix = { + binaryCaches = ["http://cache.prism.r"]; + binaryCachePublicKeys = ["cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="]; + }; + } ]; networking.hostName = config.krebs.build.host.name; -- cgit v1.2.3 From 05e339626edb6b6a62cda74ee27389fc51b8be41 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 11 Jun 2016 00:27:12 +0200 Subject: l 2: enable dummy_secrets via env --- lass/2configs/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index ce42a1ffa..6dcec5c18 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -58,7 +58,10 @@ with config.krebs.lib; user = config.krebs.users.lass; source = mapAttrs (_: mkDefault) ({ nixos-config = "symlink:stockholm/lass/1systems/${config.krebs.build.host.name}.nix"; - secrets = "/home/lass/secrets/${config.krebs.build.host.name}"; + secrets = + if getEnv "dummy_secrets" == "true" + then toString + else "/home/lass/secrets/${config.krebs.build.host.name}"; #secrets-common = "/home/lass/secrets/common"; stockholm = "/home/lass/stockholm"; nixpkgs = { -- cgit v1.2.3 From 91fe76414ad9fa217bc48c9e4ecd642dcbb38211 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 11 Jun 2016 00:28:09 +0200 Subject: l 2: add/move some basic pkgs --- lass/2configs/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 6dcec5c18..f4a0de35f 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -123,8 +123,11 @@ with config.krebs.lib; #neat utils krebspaste + pciutils psmisc + tmux untilport + usbutils #unpack stuff p7zip -- cgit v1.2.3 From 75d3e5210d7f50fa6e0bdcae9a5a495f937049f1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 11 Jun 2016 14:53:18 +0200 Subject: l 2: move nixpkgs to seperate file --- lass/2configs/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index f4a0de35f..da3123512 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -7,6 +7,7 @@ with config.krebs.lib; ../2configs/zsh.nix ../2configs/mc.nix ../2configs/retiolum.nix + ../2configs/nixpkgs.nix ./backups.nix { users.extraUsers = @@ -64,11 +65,6 @@ with config.krebs.lib; else "/home/lass/secrets/${config.krebs.build.host.name}"; #secrets-common = "/home/lass/secrets/common"; stockholm = "/home/lass/stockholm"; - nixpkgs = { - url = https://github.com/lassulus/nixpkgs; - rev = "2e971b07db3fb77e0590fff09d0b9cb086159caa"; - dev = "/home/lass/src/nixpkgs"; - }; } // optionalAttrs config.krebs.build.host.secure { #secrets-master = "/home/lass/secrets/master"; }); -- cgit v1.2.3 From bb19655339b9a77493f89b9496ade6bce9354327 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 13 Jun 2016 23:01:56 +0200 Subject: l: add and use rs pkg --- lass/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index da3123512..deb3c46c2 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -121,6 +121,7 @@ with config.krebs.lib; krebspaste pciutils psmisc + rs tmux untilport usbutils -- cgit v1.2.3 From 75ba114468a8f025d5916f5b7fce34635d9bbc1a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 18 Jun 2016 13:50:52 +0200 Subject: l 2: override stockholm if dummy_secrets --- lass/2configs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index deb3c46c2..9e0e37e48 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -59,12 +59,13 @@ with config.krebs.lib; user = config.krebs.users.lass; source = mapAttrs (_: mkDefault) ({ nixos-config = "symlink:stockholm/lass/1systems/${config.krebs.build.host.name}.nix"; - secrets = - if getEnv "dummy_secrets" == "true" + secrets = if getEnv "dummy_secrets" == "true" then toString else "/home/lass/secrets/${config.krebs.build.host.name}"; #secrets-common = "/home/lass/secrets/common"; - stockholm = "/home/lass/stockholm"; + stockholm = if getEnv "dummy_secrets" == "true" + then "/var/lib/buildbot/slave/build-all/build" + else "/home/lass/stockholm"; } // optionalAttrs config.krebs.build.host.secure { #secrets-master = "/home/lass/secrets/master"; }); -- cgit v1.2.3 From 1c854703b23bfc7e5bad43762063493c6061ab4f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 25 Jun 2016 09:56:20 +0200 Subject: l 2: set stockholm to $PWD --- lass/2configs/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 9e0e37e48..1c79de435 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -63,9 +63,7 @@ with config.krebs.lib; then toString else "/home/lass/secrets/${config.krebs.build.host.name}"; #secrets-common = "/home/lass/secrets/common"; - stockholm = if getEnv "dummy_secrets" == "true" - then "/var/lib/buildbot/slave/build-all/build" - else "/home/lass/stockholm"; + stockholm = getEnv "PWD"; } // optionalAttrs config.krebs.build.host.secure { #secrets-master = "/home/lass/secrets/master"; }); -- cgit v1.2.3 From 6d1a29522a136adcfb3a5cfdd39cd0cdda0a794f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 25 Jun 2016 13:18:46 +0200 Subject: l 2: add q to pkgs --- lass/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 1c79de435..95c6cf3e2 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -120,6 +120,7 @@ with config.krebs.lib; krebspaste pciutils psmisc + q rs tmux untilport -- cgit v1.2.3 From f6d5a9716f8a9dbefbeae19e43b5324f90cb543b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 25 Jun 2016 18:56:39 +0200 Subject: l: move binary-cache config to 2 --- lass/2configs/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 95c6cf3e2..b6eb33546 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -8,6 +8,7 @@ with config.krebs.lib; ../2configs/mc.nix ../2configs/retiolum.nix ../2configs/nixpkgs.nix + ../2configs/binary-cache/client.nix ./backups.nix { users.extraUsers = @@ -41,12 +42,6 @@ with config.krebs.lib; }; }; } - { - nix = { - binaryCaches = ["http://cache.prism.r"]; - binaryCachePublicKeys = ["cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="]; - }; - } ]; networking.hostName = config.krebs.build.host.name; -- cgit v1.2.3 From 6b8c65b070caaa15e04cff05782e9715f8874ddf Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 25 Jun 2016 19:41:49 +0200 Subject: l 2: add automatic garbage collection --- lass/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index b6eb33546..e3065ba84 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -9,6 +9,7 @@ with config.krebs.lib; ../2configs/retiolum.nix ../2configs/nixpkgs.nix ../2configs/binary-cache/client.nix + ../2configs/gc.nix ./backups.nix { users.extraUsers = -- cgit v1.2.3 From 674b4c38ee845e392b2fe1e6fb715702dfec35a0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 28 Jun 2016 17:54:56 +0200 Subject: l 2: useChroot -> useSandbox --- lass/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs/default.nix') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index e3065ba84..377554514 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -66,7 +66,7 @@ with config.krebs.lib; }; }; - nix.useChroot = true; + nix.useSandbox = true; users.mutableUsers = false; -- cgit v1.2.3