Merge remote-tracking branch 'gum/master'

2 files changed, 92 insertions, 0 deletions

diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
new file mode 100644
index 000000000..2dd232193
--- /dev/null
+++ b/makefu/1systems/x/config.nix
@@ -0,0 +1,88 @@
+#
+#
+#
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+
+{
+  imports =
+    [ # base
+      <stockholm/makefu>
+      <stockholm/makefu/2configs/main-laptop.nix>
+      <stockholm/makefu/2configs/extra-fonts.nix>
+      <stockholm/makefu/2configs/tools/all.nix>
+      <stockholm/makefu/2configs/laptop-backup.nix>
+      <stockholm/makefu/2configs/dnscrypt.nix>
+      <stockholm/makefu/2configs/avahi.nix>
+
+      # Debugging
+      # <stockholm/makefu/2configs/disable_v6.nix>
+
+      # Testing
+      # <stockholm/makefu/2configs/lanparty/lancache.nix>
+      # <stockholm/makefu/2configs/lanparty/lancache-dns.nix>
+      # <stockholm/makefu/2configs/deployment/dirctator.nix>
+      # <stockholm/makefu/2configs/vncserver.nix>
+      # <stockholm/makefu/2configs/deployment/led-fader>
+      # <stockholm/makefu/2configs/deployment/hound>
+
+      # Krebs
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+
+      # applications
+      <stockholm/makefu/2configs/exim-retiolum.nix>
+      <stockholm/makefu/2configs/mail-client.nix>
+      <stockholm/makefu/2configs/printer.nix>
+      <stockholm/makefu/2configs/task-client.nix>
+
+      # Virtualization
+      <stockholm/makefu/2configs/virtualization.nix>
+      <stockholm/makefu/2configs/docker.nix>
+      <stockholm/makefu/2configs/virtualization-virtualbox.nix>
+
+      # Services
+      <stockholm/makefu/2configs/git/brain-retiolum.nix>
+      <stockholm/makefu/2configs/tor.nix>
+      <stockholm/makefu/2configs/steam.nix>
+      # <stockholm/makefu/2configs/buildbot-standalone.nix>
+
+      # Hardware
+      <stockholm/makefu/2configs/hw/tp-x230.nix>
+      <stockholm/makefu/2configs/hw/rtl8812au.nix>
+      <stockholm/makefu/2configs/hw/exfat-nofuse.nix>
+      <stockholm/makefu/2configs/hw/wwan.nix>
+      # <stockholm/makefu/2configs/hw/stk1160.nix>
+      # <stockholm/makefu/2configs/rad1o.nix>
+
+      # Filesystem
+      <stockholm/makefu/2configs/fs/sda-crypto-root-home.nix>
+
+      # Security
+      <stockholm/makefu/2configs/sshd-totp.nix>
+
+    ];
+
+  makefu.server.primary-itf = "wlp3s0";
+  makefu.full-populate = true;
+  makefu.umts.apn = "web.vodafone.de";
+
+  nixpkgs.config.allowUnfree = true;
+
+  environment.systemPackages = [ pkgs.passwdqc-utils ];
+
+
+  # configure pulseAudio to provide a HDMI sink as well
+  networking.firewall.enable = true;
+  networking.firewall.allowedTCPPorts = [ 80 24800 26061 8000 3000 ];
+  networking.firewall.allowedUDPPorts = [ 665 26061 ];
+
+  krebs.build.host = config.krebs.hosts.x;
+
+  krebs.tinc.retiolum.connectTo = [ "omo" "gum" "prism" ];
+
+  networking.extraHosts = ''
+    192.168.1.11 omo.local
+  '';
+  # hard dependency because otherwise the device will not be unlocked
+  boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
+}
diff --git a/makefu/1systems/x/source.nix b/makefu/1systems/x/source.nix
new file mode 100644
index 000000000..54ec3c8a9
--- /dev/null
+++ b/makefu/1systems/x/source.nix
@@ -0,0 +1,4 @@
+import <stockholm/makefu/source.nix> {
+  name="x";
+  full = true;
+}