summaryrefslogtreecommitdiffstats
path: root/tv/1systems
diff options
context:
space:
mode:
Diffstat (limited to 'tv/1systems')
-rw-r--r--tv/1systems/alnus/config.nix (renamed from tv/1systems/alnus.nix)9
-rw-r--r--tv/1systems/alnus/source.nix4
-rw-r--r--tv/1systems/caxi/config.nix (renamed from tv/1systems/caxi.nix)8
-rw-r--r--tv/1systems/caxi/source.nix3
-rw-r--r--tv/1systems/cd/config.nix (renamed from tv/1systems/cd.nix)10
-rw-r--r--tv/1systems/cd/source.nix3
-rw-r--r--tv/1systems/mu/config.nix (renamed from tv/1systems/mu.nix)10
-rw-r--r--tv/1systems/mu/source.nix3
-rw-r--r--tv/1systems/nomic/config.nix (renamed from tv/1systems/nomic.nix)20
-rw-r--r--tv/1systems/nomic/source.nix4
-rw-r--r--tv/1systems/test/source.nix3
-rw-r--r--tv/1systems/wu/config.nix (renamed from tv/1systems/wu.nix)22
-rw-r--r--tv/1systems/wu/source.nix4
-rw-r--r--tv/1systems/xu/config.nix (renamed from tv/1systems/xu.nix)24
-rw-r--r--tv/1systems/xu/source.nix4
-rw-r--r--tv/1systems/zu/config.nix (renamed from tv/1systems/zu.nix)20
-rw-r--r--tv/1systems/zu/source.nix4
17 files changed, 93 insertions, 62 deletions
diff --git a/tv/1systems/alnus.nix b/tv/1systems/alnus/config.nix
index ef2a0500f..dd9e594fc 100644
--- a/tv/1systems/alnus.nix
+++ b/tv/1systems/alnus/config.nix
@@ -4,10 +4,10 @@ with import <stockholm/lib>;
{
imports = [
- ../.
- ../2configs/hw/x220.nix
- ../2configs/exim-retiolum.nix
- ../2configs/retiolum.nix
+ <stockholm/tv>
+ <stockholm/tv/2configs/hw/x220.nix>
+ <stockholm/tv/2configs/exim-retiolum.nix>
+ <stockholm/tv/2configs/retiolum.nix>
];
# TODO remove non-hardware stuff from ../2configs/hw/x220.nix
@@ -58,7 +58,6 @@ with import <stockholm/lib>;
krebs.build = {
host = config.krebs.hosts.alnus;
user = mkForce config.krebs.users.dv;
- source.nixpkgs.git.ref = mkForce "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
};
networking.networkmanager.enable = true;
diff --git a/tv/1systems/alnus/source.nix b/tv/1systems/alnus/source.nix
new file mode 100644
index 000000000..c3ed4dcfb
--- /dev/null
+++ b/tv/1systems/alnus/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/tv/source.nix> {
+ name = "alnus";
+ override.nixpkgs.git.ref = "9b948ea439ddbaa26740ce35543e7e35d2aa6d18";
+}
diff --git a/tv/1systems/caxi.nix b/tv/1systems/caxi/config.nix
index 59f3cd63a..b136d1ade 100644
--- a/tv/1systems/caxi.nix
+++ b/tv/1systems/caxi/config.nix
@@ -6,10 +6,10 @@ with import <stockholm/lib>;
krebs.build.host = config.krebs.hosts.caxi;
imports = [
- ../.
- ../2configs/hw/CAC-Developer-1.nix
- ../2configs/fs/CAC-CentOS-7-64bit.nix
- ../2configs/retiolum.nix
+ <stockholm/tv>
+ <stockholm/tv/2configs/hw/CAC-Developer-1.nix>
+ <stockholm/tv/2configs/fs/CAC-CentOS-7-64bit.nix>
+ <stockholm/tv/2configs/retiolum.nix>
];
networking = let
diff --git a/tv/1systems/caxi/source.nix b/tv/1systems/caxi/source.nix
new file mode 100644
index 000000000..bc875b768
--- /dev/null
+++ b/tv/1systems/caxi/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/tv/source.nix> {
+ name = "caxi";
+}
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd/config.nix
index 9f2cec574..f78bcafeb 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd/config.nix
@@ -6,11 +6,11 @@ with import <stockholm/lib>;
krebs.build.host = config.krebs.hosts.cd;
imports = [
- ../.
- ../2configs/hw/CAC-Developer-2.nix
- ../2configs/fs/CAC-CentOS-7-64bit.nix
- ../2configs/exim-smarthost.nix
- ../2configs/retiolum.nix
+ <stockholm/tv>
+ <stockholm/tv/2configs/hw/CAC-Developer-2.nix>
+ <stockholm/tv/2configs/fs/CAC-CentOS-7-64bit.nix>
+ <stockholm/tv/2configs/exim-smarthost.nix>
+ <stockholm/tv/2configs/retiolum.nix>
];
networking = {
diff --git a/tv/1systems/cd/source.nix b/tv/1systems/cd/source.nix
new file mode 100644
index 000000000..019e8bc22
--- /dev/null
+++ b/tv/1systems/cd/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/tv/source.nix> {
+ name = "cd";
+}
diff --git a/tv/1systems/mu.nix b/tv/1systems/mu/config.nix
index 3f3b2c2f4..239f333b5 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu/config.nix
@@ -4,11 +4,11 @@ with import <stockholm/lib>;
{
imports = [
- ../../krebs
- ../2configs
- ../3modules
- ../2configs/exim-retiolum.nix
- ../2configs/retiolum.nix
+ <stockholm/krebs>
+ <stockholm/tv/2configs>
+ <stockholm/tv/3modules>
+ <stockholm/tv/2configs/exim-retiolum.nix>
+ <stockholm/tv/2configs/retiolum.nix>
];
krebs.build.host = config.krebs.hosts.mu;
diff --git a/tv/1systems/mu/source.nix b/tv/1systems/mu/source.nix
new file mode 100644
index 000000000..7e148cf36
--- /dev/null
+++ b/tv/1systems/mu/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/tv/source.nix> {
+ name = "mu";
+}
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic/config.nix
index 9b9502254..d0144986b 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic/config.nix
@@ -6,16 +6,16 @@ with import <stockholm/lib>;
krebs.build.host = config.krebs.hosts.nomic;
imports = [
- ../.
- ../2configs/hw/x220.nix
- ../2configs/exim-retiolum.nix
- ../2configs/gitrepos.nix
- ../2configs/im.nix
- ../2configs/mail-client.nix
- ../2configs/nginx/public_html.nix
- ../2configs/pulse.nix
- ../2configs/retiolum.nix
- ../2configs/xserver
+ <stockholm/tv>
+ <stockholm/tv/2configs/hw/x220.nix>
+ <stockholm/tv/2configs/exim-retiolum.nix>
+ <stockholm/tv/2configs/gitrepos.nix>
+ <stockholm/tv/2configs/im.nix>
+ <stockholm/tv/2configs/mail-client.nix>
+ <stockholm/tv/2configs/nginx/public_html.nix>
+ <stockholm/tv/2configs/pulse.nix>
+ <stockholm/tv/2configs/retiolum.nix>
+ <stockholm/tv/2configs/xserver>
];
boot.initrd.luks = {
diff --git a/tv/1systems/nomic/source.nix b/tv/1systems/nomic/source.nix
new file mode 100644
index 000000000..f173b65a6
--- /dev/null
+++ b/tv/1systems/nomic/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/tv/source.nix> {
+ name = "nomic";
+ secure = true;
+}
diff --git a/tv/1systems/test/source.nix b/tv/1systems/test/source.nix
new file mode 100644
index 000000000..f756b8586
--- /dev/null
+++ b/tv/1systems/test/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/tv/source.nix> {
+ name = "test";
+}
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu/config.nix
index 4b3bf8538..5b2542acd 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu/config.nix
@@ -6,17 +6,17 @@ with import <stockholm/lib>;
krebs.build.host = config.krebs.hosts.wu;
imports = [
- ../.
- ../2configs/hw/w110er.nix
- ../2configs/exim-retiolum.nix
- ../2configs/gitrepos.nix
- ../2configs/im.nix
- ../2configs/mail-client.nix
- ../2configs/man.nix
- ../2configs/nginx/public_html.nix
- ../2configs/pulse.nix
- ../2configs/retiolum.nix
- ../2configs/xserver
+ <stockholm/tv>
+ <stockholm/tv/2configs/hw/w110er.nix>
+ <stockholm/tv/2configs/exim-retiolum.nix>
+ <stockholm/tv/2configs/gitrepos.nix>
+ <stockholm/tv/2configs/im.nix>
+ <stockholm/tv/2configs/mail-client.nix>
+ <stockholm/tv/2configs/man.nix>
+ <stockholm/tv/2configs/nginx/public_html.nix>
+ <stockholm/tv/2configs/pulse.nix>
+ <stockholm/tv/2configs/retiolum.nix>
+ <stockholm/tv/2configs/xserver>
{
environment.systemPackages = with pkgs; [
# root
diff --git a/tv/1systems/wu/source.nix b/tv/1systems/wu/source.nix
new file mode 100644
index 000000000..2e9cdeb8a
--- /dev/null
+++ b/tv/1systems/wu/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/tv/source.nix> {
+ name = "wu";
+ secure = true;
+}
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu/config.nix
index d82f45ac0..2bffdddb3 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu/config.nix
@@ -6,18 +6,18 @@ with import <stockholm/lib>;
krebs.build.host = config.krebs.hosts.xu;
imports = [
- ../.
- ../2configs/hw/x220.nix
- ../2configs/exim-retiolum.nix
- ../2configs/gitconfig.nix
- ../2configs/gitrepos.nix
- ../2configs/mail-client.nix
- ../2configs/man.nix
- ../2configs/nginx/public_html.nix
- ../2configs/pulse.nix
- ../2configs/retiolum.nix
- ../2configs/binary-cache
- ../2configs/xserver
+ <stockholm/tv>
+ <stockholm/tv/2configs/hw/x220.nix>
+ <stockholm/tv/2configs/exim-retiolum.nix>
+ <stockholm/tv/2configs/gitconfig.nix>
+ <stockholm/tv/2configs/gitrepos.nix>
+ <stockholm/tv/2configs/mail-client.nix>
+ <stockholm/tv/2configs/man.nix>
+ <stockholm/tv/2configs/nginx/public_html.nix>
+ <stockholm/tv/2configs/pulse.nix>
+ <stockholm/tv/2configs/retiolum.nix>
+ <stockholm/tv/2configs/binary-cache>
+ <stockholm/tv/2configs/xserver>
{
environment.systemPackages = with pkgs; [
diff --git a/tv/1systems/xu/source.nix b/tv/1systems/xu/source.nix
new file mode 100644
index 000000000..46e1aee90
--- /dev/null
+++ b/tv/1systems/xu/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/tv/source.nix> {
+ name = "xu";
+ secure = true;
+}
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu/config.nix
index 4fae3ca75..d2aab8c51 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu/config.nix
@@ -12,16 +12,16 @@ with import <stockholm/lib>;
default = {};
};
}
- ../.
- ../2configs/hw/x220.nix
- ../2configs/exim-retiolum.nix
- ../2configs/gitrepos.nix
- ../2configs/mail-client.nix
- ../2configs/man.nix
- ../2configs/nginx/public_html.nix
- ../2configs/pulse.nix
- ../2configs/retiolum.nix
- ../2configs/xserver
+ <stockholm/tv>
+ <stockholm/tv/2configs/hw/x220.nix>
+ <stockholm/tv/2configs/exim-retiolum.nix>
+ <stockholm/tv/2configs/gitrepos.nix>
+ <stockholm/tv/2configs/mail-client.nix>
+ <stockholm/tv/2configs/man.nix>
+ <stockholm/tv/2configs/nginx/public_html.nix>
+ <stockholm/tv/2configs/pulse.nix>
+ <stockholm/tv/2configs/retiolum.nix>
+ <stockholm/tv/2configs/xserver>
{
environment.systemPackages = with pkgs; [
diff --git a/tv/1systems/zu/source.nix b/tv/1systems/zu/source.nix
new file mode 100644
index 000000000..7a5c4f523
--- /dev/null
+++ b/tv/1systems/zu/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/tv/source.nix> {
+ name = "zu";
+ secure = true;
+}