Merge remote-tracking branch 'gum/master'

42 files changed, 366 insertions, 316 deletions

diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth/config.nix
index b39021176..c8d17ca70 100644
--- a/makefu/1systems/darth.nix
+++ b/makefu/1systems/darth/config.nix
@@ -10,15 +10,15 @@ let
   allDisks = [ rootDisk ]; # auxDisk
 in {
   imports = [
-      ../.
-      ../2configs/fs/single-partition-ext4.nix
-      ../2configs/zsh-user.nix
-      ../2configs/smart-monitor.nix
-      ../2configs/exim-retiolum.nix
-      ../2configs/virtualization.nix
+      <stockholm/makefu>
+      <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+      <stockholm/makefu/2configs/zsh-user.nix>
+      <stockholm/makefu/2configs/smart-monitor.nix>
+      <stockholm/makefu/2configs/exim-retiolum.nix>
+      <stockholm/makefu/2configs/virtualization.nix>
 
-      ../2configs/tinc/retiolum.nix
-      ../2configs/temp-share-samba.nix
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+      <stockholm/makefu/2configs/temp-share-samba.nix>
   ];
   services.samba.shares = {
       isos = {
diff --git a/makefu/1systems/darth/source.nix b/makefu/1systems/darth/source.nix
new file mode 100644
index 000000000..b13b6c603
--- /dev/null
+++ b/makefu/1systems/darth/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="darth";
+}
diff --git a/makefu/1systems/drop.nix b/makefu/1systems/drop/config.nix
index 4a94c3f61..b7e0d0395 100644
--- a/makefu/1systems/drop.nix
+++ b/makefu/1systems/drop/config.nix
@@ -5,10 +5,10 @@ let
   prefixLength = 18;
 in {
   imports = [
-      ../.
-      ../2configs/hw/CAC.nix
-      ../2configs/save-diskspace.nix
-      ../2configs/torrent.nix
+      <stockholm/makefu>
+      <stockholm/makefu/2configs/hw/CAC.nix>
+      <stockholm/makefu/2configs/save-diskspace.nix>
+      <stockholm/makefu/2configs/torrent.nix>
   ];
   krebs = {
     enable = true;
diff --git a/makefu/1systems/drop/source.nix b/makefu/1systems/drop/source.nix
new file mode 100644
index 000000000..74de846c0
--- /dev/null
+++ b/makefu/1systems/drop/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="drop";
+}
diff --git a/makefu/1systems/fileleech.nix b/makefu/1systems/fileleech/config.nix
index 3aa5a54f8..b5ec370a5 100644
--- a/makefu/1systems/fileleech.nix
+++ b/makefu/1systems/fileleech/config.nix
@@ -22,16 +22,16 @@ let
   disks = [ { name = "luksroot"; device = rootPartition; } ] ++ dataDisks;
 in {
     imports = [
-      ../.
-      ../2configs/tinc/retiolum.nix
-      ../2configs/disable_v6.nix
-      # ../2configs/torrent.nix
-      ../2configs/fs/sda-crypto-root.nix
+      <stockholm/makefu>
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+      <stockholm/makefu/2configs/disable_v6.nix>
+      # <stockholm/makefu/2configs/torrent.nix>
+      <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
 
-      #../2configs/elchos/irc-token.nix
-      ../2configs/elchos/log.nix
-      ../2configs/elchos/search.nix
-      ../2configs/elchos/stats.nix
+      #<stockholm/makefu/2configs/elchos/irc-token.nix>
+      <stockholm/makefu/2configs/elchos/log.nix>
+      <stockholm/makefu/2configs/elchos/search.nix>
+      <stockholm/makefu/2configs/elchos/stats.nix>
 
     ];
   systemd.services.grafana.serviceConfig.LimitNOFILE=10032;
diff --git a/makefu/1systems/fileleech/source.nix b/makefu/1systems/fileleech/source.nix
new file mode 100644
index 000000000..699267e21
--- /dev/null
+++ b/makefu/1systems/fileleech/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="fileleech";
+}
diff --git a/makefu/1systems/filepimp.nix b/makefu/1systems/filepimp/config.nix
index e143d0046..65e81af66 100644
--- a/makefu/1systems/filepimp.nix
+++ b/makefu/1systems/filepimp/config.nix
@@ -20,11 +20,11 @@ let
 in {
   imports =
     [ # Include the results of the hardware scan.
-      ../.
-      ../2configs/fs/single-partition-ext4.nix
-      ../2configs/smart-monitor.nix
-      ../2configs/tinc/retiolum.nix
-      ../2configs/filepimp-share.nix
+      <stockholm/makefu>
+      <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+      <stockholm/makefu/2configs/smart-monitor.nix>
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+      <stockholm/makefu/2configs/filepimp-share.nix>
     ];
 
   krebs.build.host = config.krebs.hosts.filepimp;
@@ -73,9 +73,9 @@ in {
     xfsmount = name: dev:
       { "/media/${name}" = { device = dev; fsType = "xfs"; }; };
   in
-  # (xfsmount "j0" (part1 jDisk0))   //
-    (xfsmount "j1" (part1 jDisk1))   //
-    (xfsmount "j2" (part1 jDisk2))   //
+  # (xfsmount "j0" (part1 jDisk0)) <stockholm/makefu>
+    (xfsmount "j1" (part1 jDisk1)) <stockholm/makefu>
+    (xfsmount "j2" (part1 jDisk2)) <stockholm/makefu>
     (xfsmount "par0" (part1 jDisk3))
     ;
 
diff --git a/makefu/1systems/filepimp/source.nix b/makefu/1systems/filepimp/source.nix
new file mode 100644
index 000000000..88c9f4f08
--- /dev/null
+++ b/makefu/1systems/filepimp/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="filepimp";
+}
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum/config.nix
index 51761d3fd..aaddd8a68 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum/config.nix
@@ -13,47 +13,47 @@ let
   main-disk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0";
 in {
   imports = [
-      ../.
+      <stockholm/makefu>
        <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-      ../2configs/headless.nix
-      ../2configs/fs/single-partition-ext4.nix
-      # ../2configs/smart-monitor.nix
-      ../2configs/git/cgit-retiolum.nix
-      ../2configs/backup.nix
-      # ../2configs/mattermost-docker.nix
-      # ../2configs/disable_v6.nix
-      ../2configs/exim-retiolum.nix
-      ../2configs/tinc/retiolum.nix
-      ../2configs/urlwatch
+      <stockholm/makefu/2configs/headless.nix>
+      <stockholm/makefu/2configs/fs/single-partition-ext4.nix>
+      # <stockholm/makefu/2configs/smart-monitor.nix>
+      <stockholm/makefu/2configs/git/cgit-retiolum.nix>
+      <stockholm/makefu/2configs/backup.nix>
+      # <stockholm/makefu/2configs/mattermost-docker.nix>
+      # <stockholm/makefu/2configs/disable_v6.nix>
+      <stockholm/makefu/2configs/exim-retiolum.nix>
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+      <stockholm/makefu/2configs/urlwatch>
 
       # Security
-      ../2configs/sshd-totp.nix
+      <stockholm/makefu/2configs/sshd-totp.nix>
 
       # Tools
-      ../2configs/tools/core.nix
-      ../2configs/tools/dev.nix
-      ../2configs/tools/sec.nix
+      <stockholm/makefu/2configs/tools/core.nix>
+      <stockholm/makefu/2configs/tools/dev.nix>
+      <stockholm/makefu/2configs/tools/sec.nix>
 
       # services
-      ../2configs/share/gum.nix
-      ../2configs/sabnzbd.nix
-      ../2configs/torrent.nix
-      ../2configs/iodined.nix
+      <stockholm/makefu/2configs/share/gum.nix>
+      <stockholm/makefu/2configs/sabnzbd.nix>
+      <stockholm/makefu/2configs/torrent.nix>
+      <stockholm/makefu/2configs/iodined.nix>
 
       ## Web
-      ../2configs/nginx/share-download.nix
-      ../2configs/nginx/euer.test.nix
-      ../2configs/nginx/euer.wiki.nix
-      ../2configs/nginx/euer.blog.nix
-      ../2configs/nginx/public_html.nix
-      ../2configs/nginx/update.connector.one.nix
-
-      ../2configs/deployment/mycube.connector.one.nix
-      ../2configs/deployment/graphs.nix
-      ../2configs/deployment/owncloud.nix
-      ../2configs/deployment/wiki-irc-bot
-      ../2configs/deployment/boot-euer.nix
-      ../2configs/deployment/hound
+      <stockholm/makefu/2configs/nginx/share-download.nix>
+      <stockholm/makefu/2configs/nginx/euer.test.nix>
+      <stockholm/makefu/2configs/nginx/euer.wiki.nix>
+      <stockholm/makefu/2configs/nginx/euer.blog.nix>
+      <stockholm/makefu/2configs/nginx/public_html.nix>
+      <stockholm/makefu/2configs/nginx/update.connector.one.nix>
+
+      <stockholm/makefu/2configs/deployment/mycube.connector.one.nix>
+      <stockholm/makefu/2configs/deployment/graphs.nix>
+      <stockholm/makefu/2configs/deployment/owncloud.nix>
+      <stockholm/makefu/2configs/deployment/wiki-irc-bot>
+      <stockholm/makefu/2configs/deployment/boot-euer.nix>
+      <stockholm/makefu/2configs/deployment/hound>
       {
         services.taskserver.enable = true;
         services.taskserver.fqdn = config.krebs.build.host.name;
@@ -64,12 +64,12 @@ in {
           ip6tables -A INPUT -i retiolum -p tcp --dport 53589 -j ACCEPT
         '';
       }
-      # ../2configs/ipfs.nix
-      ../2configs/syncthing.nix
+      # <stockholm/makefu/2configs/ipfs.nix>
+      <stockholm/makefu/2configs/syncthing.nix>
 
-      # ../2configs/opentracker.nix
-      ../2configs/stats/client.nix
-      # ../2configs/logging/client.nix
+      # <stockholm/makefu/2configs/opentracker.nix>
+      <stockholm/makefu/2configs/stats/client.nix>
+      # <stockholm/makefu/2configs/logging/client.nix>
 
   ];
   makefu.dl-dir = "/var/download";
diff --git a/makefu/1systems/gum/source.nix b/makefu/1systems/gum/source.nix
new file mode 100644
index 000000000..82d42b496
--- /dev/null
+++ b/makefu/1systems/gum/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="gum";
+}
diff --git a/makefu/1systems/iso.nix b/makefu/1systems/iso/config.nix
index c679241e5..f863321bd 100644
--- a/makefu/1systems/iso.nix
+++ b/makefu/1systems/iso/config.nix
@@ -3,10 +3,10 @@
 with import <stockholm/lib>;
 {
   imports = [
-    ../.
+    <stockholm/makefu>
     <nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix>
     <nixpkgs/nixos/modules/installer/cd-dvd/channel.nix>
-    ../2configs/tools/core.nix
+    <stockholm/makefu/2configs/tools/core.nix>
   ];
   # TODO: NIX_PATH and nix.nixPath are being set by default.nix right now
   # cd ~/stockholm ; nix-build -A config.system.build.isoImage -I nixos-config=makefu/1systems/iso.nix -I secrets=/home/makefu/secrets/iso /var/src/nixpkgs/nixos
diff --git a/makefu/1systems/iso/source.nix b/makefu/1systems/iso/source.nix
new file mode 100644
index 000000000..e200dbfd2
--- /dev/null
+++ b/makefu/1systems/iso/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="iso";
+}
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo/config.nix
index 0f1b8e0da..732f1d860 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo/config.nix
@@ -39,35 +39,35 @@ let
 in {
   imports =
     [
-      ../.
+      <stockholm/makefu>
       # TODO: unlock home partition via ssh
-      ../2configs/fs/sda-crypto-root.nix
-      ../2configs/zsh-user.nix
-      ../2configs/backup.nix
-      ../2configs/exim-retiolum.nix
-      ../2configs/smart-monitor.nix
-      ../2configs/mail-client.nix
-      # ../2configs/disable_v6.nix
-      #../2configs/graphite-standalone.nix
-      #../2configs/share-user-sftp.nix
-      ../2configs/share/omo.nix
-      ../2configs/tinc/retiolum.nix
+      <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
+      <stockholm/makefu/2configs/zsh-user.nix>
+      <stockholm/makefu/2configs/backup.nix>
+      <stockholm/makefu/2configs/exim-retiolum.nix>
+      <stockholm/makefu/2configs/smart-monitor.nix>
+      <stockholm/makefu/2configs/mail-client.nix>
+      # <stockholm/makefu/2configs/disable_v6.nix>
+      #<stockholm/makefu/2configs/graphite-standalone.nix>
+      #<stockholm/makefu/2configs/share-user-sftp.nix>
+      <stockholm/makefu/2configs/share/omo.nix>
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
 
       # Logging
-      ../2configs/stats/server.nix #influx + grafana
-      ../2configs/stats/client.nix
-      ../2configs/stats/external/aralast.nix # logs to influx
+      <stockholm/makefu/2configs/stats/server.nix #influx + grafana>
+      <stockholm/makefu/2configs/stats/client.nix>
+      <stockholm/makefu/2configs/stats/external/aralast.nix # logs to influx>
 
       # services
-      ../2configs/syncthing.nix
-      ../2configs/mqtt.nix
-      # ../2configs/logging/central-logging-client.nix
+      <stockholm/makefu/2configs/syncthing.nix>
+      <stockholm/makefu/2configs/mqtt.nix>
+      # <stockholm/makefu/2configs/logging/central-logging-client.nix>
 
-      # ../2configs/torrent.nix
+      # <stockholm/makefu/2configs/torrent.nix>
 
-      # ../2configs/elchos/search.nix
-      # ../2configs/elchos/log.nix
-      # ../2configs/elchos/irc-token.nix
+      # <stockholm/makefu/2configs/elchos/search.nix>
+      # <stockholm/makefu/2configs/elchos/log.nix>
+      # <stockholm/makefu/2configs/elchos/irc-token.nix>
 
       ## as long as pyload is not in nixpkgs:
       # docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload
diff --git a/makefu/1systems/omo/source.nix b/makefu/1systems/omo/source.nix
new file mode 100644
index 000000000..94fd9cbe6
--- /dev/null
+++ b/makefu/1systems/omo/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="omo";
+}
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp/config.nix
index 971676b79..cc6326f19 100644
--- a/makefu/1systems/pnp.nix
+++ b/makefu/1systems/pnp/config.nix
@@ -6,16 +6,16 @@
 {
   imports =
     [
-      ../.
-      ../2configs/headless.nix
+      <stockholm/makefu>
+      <stockholm/makefu/2configs/headless.nix>
       ../../krebs/3modules/Reaktor.nix
 
       # these will be overwritten by qemu-vm.nix but will be used if the system
       # is directly deployed
       <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-      ../2configs/fs/vm-single-partition.nix
+      <stockholm/makefu/2configs/fs/vm-single-partition.nix>
 
-      ../2configs/tinc/retiolum.nix
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
 
       # config.system.build.vm
       (toString <nixpkgs/nixos/modules/virtualisation/qemu-vm.nix>)
diff --git a/makefu/1systems/pnp/source.nix b/makefu/1systems/pnp/source.nix
new file mode 100644
index 000000000..0b630aa3b
--- /dev/null
+++ b/makefu/1systems/pnp/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="pnp";
+}
diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit/config.nix
index 7102b8f81..996abff08 100644
--- a/makefu/1systems/repunit.nix
+++ b/makefu/1systems/repunit/config.nix
@@ -7,10 +7,10 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      ../.
+      <stockholm/makefu>
       <nixpkgs/nixos/modules/profiles/qemu-guest.nix>
-      ../2configs/git/cgit-retiolum.nix
-      ../2configs/tinc/retiolum.nix
+      <stockholm/makefu/2configs/git/cgit-retiolum.nix>
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
     ];
   krebs.build.host = config.krebs.hosts.repunit;
 
diff --git a/makefu/1systems/repunit/source.nix b/makefu/1systems/repunit/source.nix
new file mode 100644
index 000000000..ff361fb55
--- /dev/null
+++ b/makefu/1systems/repunit/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="repunit";
+}
diff --git a/makefu/1systems/sdev.nix b/makefu/1systems/sdev/config.nix
index 233f7cefa..f3853a788 100644
--- a/makefu/1systems/sdev.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -4,14 +4,14 @@
   makefu.awesome.modkey = "Mod1";
   imports =
     [ # Include the results of the hardware scan.
-      ../.
+      <stockholm/makefu>
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
-      ../2configs/main-laptop.nix #< base-gui
+      <stockholm/makefu/2configs/main-laptop.nix #< base-gui>
       # <secrets/extra-hosts.nix>
 
       # environment
-      ../2configs/tinc/retiolum.nix
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
 
     ];
   # workaround for https://github.com/NixOS/nixpkgs/issues/16641
diff --git a/makefu/1systems/sdev/source.nix b/makefu/1systems/sdev/source.nix
new file mode 100644
index 000000000..833d9bf73
--- /dev/null
+++ b/makefu/1systems/sdev/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="sdev";
+}
diff --git a/makefu/1systems/shoney.nix b/makefu/1systems/shoney/config.nix
index 9f04e97eb..6cec260d2 100644
--- a/makefu/1systems/shoney.nix
+++ b/makefu/1systems/shoney/config.nix
@@ -9,12 +9,12 @@ let
   gw = "64.137.234.1";
 in {
   imports = [
-    ../.
-    ../2configs/save-diskspace.nix
-    ../2configs/hw/CAC.nix
-    ../2configs/fs/CAC-CentOS-7-64bit.nix
-    ../2configs/tinc/retiolum.nix
-    ../2configs/torrent.nix
+    <stockholm/makefu>
+    <stockholm/makefu/2configs/save-diskspace.nix>
+    <stockholm/makefu/2configs/hw/CAC.nix>
+    <stockholm/makefu/2configs/fs/CAC-CentOS-7-64bit.nix>
+    <stockholm/makefu/2configs/tinc/retiolum.nix>
+    <stockholm/makefu/2configs/torrent.nix>
   ];
 
 
diff --git a/makefu/1systems/shoney/source.nix b/makefu/1systems/shoney/source.nix
new file mode 100644
index 000000000..382474f5e
--- /dev/null
+++ b/makefu/1systems/shoney/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="shoney";
+}
diff --git a/makefu/1systems/studio.nix b/makefu/1systems/studio/config.nix
index f7d49cac6..b9a1a5d6a 100644
--- a/makefu/1systems/studio.nix
+++ b/makefu/1systems/studio/config.nix
@@ -1,14 +1,14 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ../.
-    ../2configs/vncserver.nix
-    ../2configs/vim.nix
-    ../2configs/disable_v6.nix
-    ../2configs/audio/jack-on-pulse.nix
-    ../2configs/audio/realtime-audio.nix
-    ../2configs/gui/studio.nix
-    ../2configs/binary-cache/lass.nix
+    <stockholm/makefu>
+    <stockholm/makefu/2configs/vncserver.nix>
+    <stockholm/makefu/2configs/vim.nix>
+    <stockholm/makefu/2configs/disable_v6.nix>
+    <stockholm/makefu/2configs/audio/jack-on-pulse.nix>
+    <stockholm/makefu/2configs/audio/realtime-audio.nix>
+    <stockholm/makefu/2configs/gui/studio.nix>
+    <stockholm/makefu/2configs/binary-cache/lass.nix>
 
   ];
   makefu.gui.user = "user"; # we use an extra user
diff --git a/makefu/1systems/studio/source.nix b/makefu/1systems/studio/source.nix
new file mode 100644
index 000000000..092330a50
--- /dev/null
+++ b/makefu/1systems/studio/source.nix
@@ -0,0 +1,7 @@
+import <stockholm/makefu/source.nix> {
+  name="studio";
+  override.musnix.git = {
+    url = https://github.com/musnix/musnix.git;
+    ref = "f0ec1f3";
+  };
+}
diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
deleted file mode 100644
index 25fc2b49b..000000000
--- a/makefu/1systems/tsp.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-#
-#
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ../.
-      ../2configs/gui/base.nix
-      ../2configs/fs/sda-crypto-root.nix
-      # hardware specifics are in here
-      ../2configs/hw/tp-x200.nix #< imports tp-x2x0.nix
-
-      ../2configs/disable_v6.nix
-      ../2configs/rad1o.nix
-
-      ../2configs/zsh-user.nix
-      ../2configs/exim-retiolum.nix
-      ../2configs/tinc/retiolum.nix
-    ];
-  # not working in vm
-  krebs.build.host = config.krebs.hosts.tsp;
-
-  networking.firewall.allowedTCPPorts = [
-    25
-  ];
-
-}
diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix
new file mode 100644
index 000000000..7169638d4
--- /dev/null
+++ b/makefu/1systems/tsp/config.nix
@@ -0,0 +1,29 @@
+#
+#
+#
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      <stockholm/makefu>
+      <stockholm/makefu/2configs/gui/base.nix>
+      <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
+      # hardware specifics are in here
+      <stockholm/makefu/2configs/hw/tp-x200.nix #< imports tp-x2x0.nix>
+
+      <stockholm/makefu/2configs/disable_v6.nix>
+      <stockholm/makefu/2configs/rad1o.nix>
+
+      <stockholm/makefu/2configs/zsh-user.nix>
+      <stockholm/makefu/2configs/exim-retiolum.nix>
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+    ];
+  # not working in vm
+  krebs.build.host = config.krebs.hosts.tsp;
+
+  networking.firewall.allowedTCPPorts = [
+    25
+  ];
+
+}
diff --git a/makefu/1systems/tsp/source.nix b/makefu/1systems/tsp/source.nix
new file mode 100644
index 000000000..79f6a435d
--- /dev/null
+++ b/makefu/1systems/tsp/source.nix
@@ -0,0 +1,3 @@
+import <stockholm/makefu/source.nix> {
+  name="tsp";
+}
diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob/config.nix
index d8e275bf6..933fcf047 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -4,24 +4,24 @@
   makefu.awesome.modkey = "Mod1";
   imports =
     [ # Include the results of the hardware scan.
-      ../.
+      <stockholm/makefu>
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
-      ../2configs/main-laptop.nix #< base-gui
-      ../2configs/sshd-totp.nix
+      <stockholm/makefu/2configs/main-laptop.nix #< base-gui>
+      <stockholm/makefu/2configs/sshd-totp.nix>
 
       # Tools
-      ../2configs/tools/core.nix
-      ../2configs/tools/core-gui.nix
-      ../2configs/tools/dev.nix
-      ../2configs/tools/extra-gui.nix
-      ../2configs/tools/sec.nix
+      <stockholm/makefu/2configs/tools/core.nix>
+      <stockholm/makefu/2configs/tools/core-gui.nix>
+      <stockholm/makefu/2configs/tools/dev.nix>
+      <stockholm/makefu/2configs/tools/extra-gui.nix>