From b6383dba83a2e9ec6ada40fb780c15a56c8d715e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 27 Sep 2015 20:04:28 +0200 Subject: lass 2 base: bump nixpkgs rev --- lass/2configs/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 7c483546..6cdeab1b 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -44,7 +44,7 @@ with lib; exim-retiolum.enable = true; build.deps.nixpkgs = { url = https://github.com/Lassulus/nixpkgs; - rev = "e74d0e7ff83c16846a81e1173543f180ad565076"; + rev = "68bd8e4a9dc247726ae89cc8739574261718e328"; }; }; -- cgit v1.2.3 From a6812b4440e095287b6f2228a78b65c7629866de Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 11:55:39 +0200 Subject: lass: make compatible with new krebs.build --- lass/1systems/cloudkrebs.nix | 13 +++++++------ lass/1systems/echelon.nix | 13 +++++++------ lass/1systems/mors.nix | 13 +++++++------ lass/1systems/uriel.nix | 12 +++++++----- lass/2configs/base.nix | 8 +++++--- 5 files changed, 33 insertions(+), 26 deletions(-) (limited to 'lass') diff --git a/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix index 7c95e0f8..5235c25e 100644 --- a/lass/1systems/cloudkrebs.nix +++ b/lass/1systems/cloudkrebs.nix @@ -25,14 +25,15 @@ krebs.build = { user = config.krebs.users.lass; - target = "root@cloudkrebs"; host = config.krebs.hosts.cloudkrebs; - deps = { - secrets = { - url = "/home/lass/secrets/${config.krebs.build.host.name}"; + source = { + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; }; - stockholm = { - url = toString ../..; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/dev/stockholm"; }; }; }; diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index 92976366..d1a3f34f 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -28,14 +28,15 @@ in { krebs.build = { user = config.krebs.users.lass; - target = "root@${ip}"; host = config.krebs.hosts.echelon; - deps = { - secrets = { - url = "/home/lass/secrets/${config.krebs.build.host.name}"; + source = { + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; }; - stockholm = { - url = toString ../..; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/dev/stockholm"; }; }; }; diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index de5e824c..9d234f14 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -27,14 +27,15 @@ krebs.build = { user = config.krebs.users.lass; - target = "root@mors"; host = config.krebs.hosts.mors; - deps = { - secrets = { - url = "/home/lass/secrets/${config.krebs.build.host.name}"; + source = { + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; }; - stockholm = { - url = toString ../..; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/dev/stockholm"; }; }; }; diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index bb98975e..9d96e781 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -27,12 +27,14 @@ with builtins; user = config.krebs.users.lass; target = "root@uriel"; host = config.krebs.hosts.uriel; - deps = { - secrets = { - url = "/home/lass/secrets/${config.krebs.build.host.name}"; + source = { + dir.secrets = { + host = config.krebs.hosts.mors; + path = "/home/lass/secrets/${config.krebs.build.host.name}"; }; - stockholm = { - url = toString ../..; + dir.stockholm = { + host = config.krebs.hosts.mors; + path = "/home/lass/dev/stockholm"; }; }; }; diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 6cdeab1b..46435649 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -42,9 +42,11 @@ with lib; enable = true; search-domain = "retiolum"; exim-retiolum.enable = true; - build.deps.nixpkgs = { - url = https://github.com/Lassulus/nixpkgs; - rev = "68bd8e4a9dc247726ae89cc8739574261718e328"; + build.source = { + git.nixpkgs = { + url = https://github.com/Lassulus/nixpkgs; + rev = "68bd8e4a9dc247726ae89cc8739574261718e328"; + }; }; }; -- cgit v1.2.3 From 611ff367cf3d057e78ed3112416073b1f48c6aef Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 11:56:01 +0200 Subject: lass 2 base: add get to pkgs --- lass/2configs/base.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lass') diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 46435649..948b54d8 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -75,6 +75,8 @@ with lib; most rxvt_unicode.terminfo + get + #network iptables ]; -- cgit v1.2.3 From 4d8408aa5a119d9d99c94950d829ab99fab748dc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 15:18:31 +0200 Subject: lass: install get only on mors --- lass/1systems/mors.nix | 1 + lass/2configs/base.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'lass') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 9d234f14..b7291a8f 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -174,6 +174,7 @@ environment.systemPackages = with pkgs; [ cac + get ]; #TODO: fix this shit diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 948b54d8..46435649 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -75,8 +75,6 @@ with lib; most rxvt_unicode.terminfo - get - #network iptables ]; -- cgit v1.2.3 From a34de6743a44760d21589d4e1a154ccc5c621420 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Sep 2015 15:20:13 +0200 Subject: lass 2 retiolum: connect to echelon --- lass/2configs/retiolum.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix index 17cd1d82..d7df1502 100644 --- a/lass/2configs/retiolum.nix +++ b/lass/2configs/retiolum.nix @@ -21,6 +21,7 @@ connectTo = [ "fastpoke" "cloudkrebs" + "echelon" "pigstarter" "gum" "flap" -- cgit v1.2.3 From e8a17e7e9c471108d4f552c8cb668a97df75a382 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 1 Oct 2015 17:24:54 +0200 Subject: lass 5 firefoxPlugins: remove broken link --- lass/5pkgs/firefoxPlugins/result | 1 - 1 file changed, 1 deletion(-) delete mode 120000 lass/5pkgs/firefoxPlugins/result (limited to 'lass') diff --git a/lass/5pkgs/firefoxPlugins/result b/lass/5pkgs/firefoxPlugins/result deleted file mode 120000 index aa533441..00000000 --- a/lass/5pkgs/firefoxPlugins/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/gxr152p1bbgqcd839b0rckdd1h5cr886-vimperator \ No newline at end of file -- cgit v1.2.3