From ac64527c5707cca5fc6e6e6ecf3957129cdb32b2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 28 Jul 2015 20:28:21 +0200 Subject: [PATCH] lass: port everything to stockholm --- .../lass => lass/1systems}/cloudkrebs.nix | 19 +++++++++++++++++-- {1systems/lass => lass/1systems}/mors.nix | 19 +++++++++++++++++-- {1systems/lass => lass/1systems}/uriel.nix | 19 +++++++++++++++++-- {2configs/lass => lass/2configs}/base.nix | 0 .../lass => lass/2configs}/binary-caches.nix | 0 {2configs/lass => lass/2configs}/bird.nix | 0 {2configs/lass => lass/2configs}/bitcoin.nix | 0 {2configs/lass => lass/2configs}/browsers.nix | 0 .../2configs}/chromium-patched.nix | 0 .../lass => lass/2configs}/desktop-base.nix | 0 {2configs/lass => lass/2configs}/elster.nix | 0 .../lass => lass/2configs}/fastpoke-pages.nix | 0 {2configs/lass => lass/2configs}/games.nix | 0 .../lass => lass/2configs}/gitolite-base.nix | 0 {2configs/lass => lass/2configs}/identity.nix | 0 {2configs/lass => lass/2configs}/ircd.nix | 0 .../lass => lass/2configs}/mors/repos.nix | 0 .../lass => lass/2configs}/mors/retiolum.nix | 0 .../lass => lass/2configs}/new-repos.nix | 2 +- {2configs/lass => lass/2configs}/pass.nix | 0 {2configs/lass => lass/2configs}/programs.nix | 0 {2configs/lass => lass/2configs}/retiolum.nix | 2 +- {2configs/lass => lass/2configs}/sshkeys.nix | 0 {2configs/lass => lass/2configs}/steam.nix | 0 {2configs/lass => lass/2configs}/texlive.nix | 0 {2configs/lass => lass/2configs}/urxvt.nix | 0 {2configs/lass => lass/2configs}/vim.nix | 0 .../lass => lass/2configs}/virtualbox.nix | 0 {2configs/lass => lass/2configs}/wine.nix | 0 {3modules/lass => lass/3modules}/default.nix | 0 {3modules/lass => lass/3modules}/iptables.nix | 0 {3modules/lass => lass/3modules}/sshkeys.nix | 0 {3modules/lass => lass/3modules}/urxvtd.nix | 0 .../lass => lass/3modules}/xresources.nix | 0 34 files changed, 53 insertions(+), 8 deletions(-) rename {1systems/lass => lass/1systems}/cloudkrebs.nix (59%) rename {1systems/lass => lass/1systems}/mors.nix (92%) rename {1systems/lass => lass/1systems}/uriel.nix (91%) rename {2configs/lass => lass/2configs}/base.nix (100%) rename {2configs/lass => lass/2configs}/binary-caches.nix (100%) rename {2configs/lass => lass/2configs}/bird.nix (100%) rename {2configs/lass => lass/2configs}/bitcoin.nix (100%) rename {2configs/lass => lass/2configs}/browsers.nix (100%) rename {2configs/lass => lass/2configs}/chromium-patched.nix (100%) rename {2configs/lass => lass/2configs}/desktop-base.nix (100%) rename {2configs/lass => lass/2configs}/elster.nix (100%) rename {2configs/lass => lass/2configs}/fastpoke-pages.nix (100%) rename {2configs/lass => lass/2configs}/games.nix (100%) rename {2configs/lass => lass/2configs}/gitolite-base.nix (100%) rename {2configs/lass => lass/2configs}/identity.nix (100%) rename {2configs/lass => lass/2configs}/ircd.nix (100%) rename {2configs/lass => lass/2configs}/mors/repos.nix (100%) rename {2configs/lass => lass/2configs}/mors/retiolum.nix (100%) rename {2configs/lass => lass/2configs}/new-repos.nix (97%) rename {2configs/lass => lass/2configs}/pass.nix (100%) rename {2configs/lass => lass/2configs}/programs.nix (100%) rename {2configs/lass => lass/2configs}/retiolum.nix (92%) rename {2configs/lass => lass/2configs}/sshkeys.nix (100%) rename {2configs/lass => lass/2configs}/steam.nix (100%) rename {2configs/lass => lass/2configs}/texlive.nix (100%) rename {2configs/lass => lass/2configs}/urxvt.nix (100%) rename {2configs/lass => lass/2configs}/vim.nix (100%) rename {2configs/lass => lass/2configs}/virtualbox.nix (100%) rename {2configs/lass => lass/2configs}/wine.nix (100%) rename {3modules/lass => lass/3modules}/default.nix (100%) rename {3modules/lass => lass/3modules}/iptables.nix (100%) rename {3modules/lass => lass/3modules}/sshkeys.nix (100%) rename {3modules/lass => lass/3modules}/urxvtd.nix (100%) rename {3modules/lass => lass/3modules}/xresources.nix (100%) diff --git a/1systems/lass/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix similarity index 59% rename from 1systems/lass/cloudkrebs.nix rename to lass/1systems/cloudkrebs.nix index 2c755d8cb..30a7fb51c 100644 --- a/1systems/lass/cloudkrebs.nix +++ b/lass/1systems/cloudkrebs.nix @@ -23,8 +23,23 @@ } ]; - krebs.enable = true; - krebs.build.host = config.krebs.hosts.cloudkrebs; + krebs.build = { + target = "root@cloudkrebs"; + host = config.krebs.hosts.cloudkrebs; + deps = { + nixpkgs = { + url = https://github.com/Lassulus/nixpkgs; + rev = "1879a011925c561f0a7fd4043da0768bbff41d0b"; + }; + secrets = { + url = "/home/lass/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; + }; + networking.hostName = "cloudkrebs"; } diff --git a/1systems/lass/mors.nix b/lass/1systems/mors.nix similarity index 92% rename from 1systems/lass/mors.nix rename to lass/1systems/mors.nix index 8cda1eac3..3519bff66 100644 --- a/1systems/lass/mors.nix +++ b/lass/1systems/mors.nix @@ -18,11 +18,26 @@ ../../2configs/lass/ircd.nix ../../2configs/lass/chromium-patched.nix ../../2configs/lass/new-repos.nix - ../../2configs/tv/synaptics.nix + #../../2configs/tv/synaptics.nix ../../2configs/lass/retiolum.nix ]; - krebs.build.host = config.krebs.hosts.mors; + krebs.build = { + target = "root@mors"; + host = config.krebs.hosts.mors; + deps = { + nixpkgs = { + url = https://github.com/Lassulus/nixpkgs; + rev = "1879a011925c561f0a7fd4043da0768bbff41d0b"; + }; + secrets = { + url = "/home/lass/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; + }; networking.hostName = "mors"; networking.wireless.enable = true; diff --git a/1systems/lass/uriel.nix b/lass/1systems/uriel.nix similarity index 91% rename from 1systems/lass/uriel.nix rename to lass/1systems/uriel.nix index 4fe8cf21a..8984004e1 100644 --- a/1systems/lass/uriel.nix +++ b/lass/1systems/uriel.nix @@ -23,8 +23,23 @@ with builtins; } ]; - krebs.enable = true; - krebs.build.host = config.krebs.hosts.uriel; + krebs.build = { + target = "root@uriel"; + host = config.krebs.hosts.uriel; + deps = { + nixpkgs = { + url = https://github.com/Lassulus/nixpkgs; + rev = "961fcbabd7643171ea74bd550fee1ce5c13c2e90"; + }; + secrets = { + url = "/home/lass/secrets/${config.krebs.build.host.name}"; + }; + stockholm = { + url = toString ../..; + }; + }; + }; + networking.hostName = "uriel"; networking.wireless.enable = true; diff --git a/2configs/lass/base.nix b/lass/2configs/base.nix similarity index 100% rename from 2configs/lass/base.nix rename to lass/2configs/base.nix diff --git a/2configs/lass/binary-caches.nix b/lass/2configs/binary-caches.nix similarity index 100% rename from 2configs/lass/binary-caches.nix rename to lass/2configs/binary-caches.nix diff --git a/2configs/lass/bird.nix b/lass/2configs/bird.nix similarity index 100% rename from 2configs/lass/bird.nix rename to lass/2configs/bird.nix diff --git a/2configs/lass/bitcoin.nix b/lass/2configs/bitcoin.nix similarity index 100% rename from 2configs/lass/bitcoin.nix rename to lass/2configs/bitcoin.nix diff --git a/2configs/lass/browsers.nix b/lass/2configs/browsers.nix similarity index 100% rename from 2configs/lass/browsers.nix rename to lass/2configs/browsers.nix diff --git a/2configs/lass/chromium-patched.nix b/lass/2configs/chromium-patched.nix similarity index 100% rename from 2configs/lass/chromium-patched.nix rename to lass/2configs/chromium-patched.nix diff --git a/2configs/lass/desktop-base.nix b/lass/2configs/desktop-base.nix similarity index 100% rename from 2configs/lass/desktop-base.nix rename to lass/2configs/desktop-base.nix diff --git a/2configs/lass/elster.nix b/lass/2configs/elster.nix similarity index 100% rename from 2configs/lass/elster.nix rename to lass/2configs/elster.nix diff --git a/2configs/lass/fastpoke-pages.nix b/lass/2configs/fastpoke-pages.nix similarity index 100% rename from 2configs/lass/fastpoke-pages.nix rename to lass/2configs/fastpoke-pages.nix diff --git a/2configs/lass/games.nix b/lass/2configs/games.nix similarity index 100% rename from 2configs/lass/games.nix rename to lass/2configs/games.nix diff --git a/2configs/lass/gitolite-base.nix b/lass/2configs/gitolite-base.nix similarity index 100% rename from 2configs/lass/gitolite-base.nix rename to lass/2configs/gitolite-base.nix diff --git a/2configs/lass/identity.nix b/lass/2configs/identity.nix similarity index 100% rename from 2configs/lass/identity.nix rename to lass/2configs/identity.nix diff --git a/2configs/lass/ircd.nix b/lass/2configs/ircd.nix similarity index 100% rename from 2configs/lass/ircd.nix rename to lass/2configs/ircd.nix diff --git a/2configs/lass/mors/repos.nix b/lass/2configs/mors/repos.nix similarity index 100% rename from 2configs/lass/mors/repos.nix rename to lass/2configs/mors/repos.nix diff --git a/2configs/lass/mors/retiolum.nix b/lass/2configs/mors/retiolum.nix similarity index 100% rename from 2configs/lass/mors/retiolum.nix rename to lass/2configs/mors/retiolum.nix diff --git a/2configs/lass/new-repos.nix b/lass/2configs/new-repos.nix similarity index 97% rename from 2configs/lass/new-repos.nix rename to lass/2configs/new-repos.nix index 2c73f9509..809091b32 100644 --- a/2configs/lass/new-repos.nix +++ b/lass/2configs/new-repos.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with import ../../4lib/tv { inherit lib pkgs; }; +with import ../../tv/lib { inherit lib pkgs; }; let out = { diff --git a/2configs/lass/pass.nix b/lass/2configs/pass.nix similarity index 100% rename from 2configs/lass/pass.nix rename to lass/2configs/pass.nix diff --git a/2configs/lass/programs.nix b/lass/2configs/programs.nix similarity index 100% rename from 2configs/lass/programs.nix rename to lass/2configs/programs.nix diff --git a/2configs/lass/retiolum.nix b/lass/2configs/retiolum.nix similarity index 92% rename from 2configs/lass/retiolum.nix rename to lass/2configs/retiolum.nix index 767a1ce83..95890f70e 100644 --- a/2configs/lass/retiolum.nix +++ b/lass/2configs/retiolum.nix @@ -3,7 +3,7 @@ { imports = [ ../../3modules/lass/iptables.nix - ../../2configs/tv/exim-retiolum.nix + ../../tv/configs/exim-retiolum.nix ]; lass.iptables = { diff --git a/2configs/lass/sshkeys.nix b/lass/2configs/sshkeys.nix similarity index 100% rename from 2configs/lass/sshkeys.nix rename to lass/2configs/sshkeys.nix diff --git a/2configs/lass/steam.nix b/lass/2configs/steam.nix similarity index 100% rename from 2configs/lass/steam.nix rename to lass/2configs/steam.nix diff --git a/2configs/lass/texlive.nix b/lass/2configs/texlive.nix similarity index 100% rename from 2configs/lass/texlive.nix rename to lass/2configs/texlive.nix diff --git a/2configs/lass/urxvt.nix b/lass/2configs/urxvt.nix similarity index 100% rename from 2configs/lass/urxvt.nix rename to lass/2configs/urxvt.nix diff --git a/2configs/lass/vim.nix b/lass/2configs/vim.nix similarity index 100% rename from 2configs/lass/vim.nix rename to lass/2configs/vim.nix diff --git a/2configs/lass/virtualbox.nix b/lass/2configs/virtualbox.nix similarity index 100% rename from 2configs/lass/virtualbox.nix rename to lass/2configs/virtualbox.nix diff --git a/2configs/lass/wine.nix b/lass/2configs/wine.nix similarity index 100% rename from 2configs/lass/wine.nix rename to lass/2configs/wine.nix diff --git a/3modules/lass/default.nix b/lass/3modules/default.nix similarity index 100% rename from 3modules/lass/default.nix rename to lass/3modules/default.nix diff --git a/3modules/lass/iptables.nix b/lass/3modules/iptables.nix similarity index 100% rename from 3modules/lass/iptables.nix rename to lass/3modules/iptables.nix diff --git a/3modules/lass/sshkeys.nix b/lass/3modules/sshkeys.nix similarity index 100% rename from 3modules/lass/sshkeys.nix rename to lass/3modules/sshkeys.nix diff --git a/3modules/lass/urxvtd.nix b/lass/3modules/urxvtd.nix similarity index 100% rename from 3modules/lass/urxvtd.nix rename to lass/3modules/urxvtd.nix diff --git a/3modules/lass/xresources.nix b/lass/3modules/xresources.nix similarity index 100% rename from 3modules/lass/xresources.nix rename to lass/3modules/xresources.nix