4 files changed, 38 insertions, 22 deletions
diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
index e40042b2d..8617578f0 100644
--- a/makefu/1systems/cake/config.nix
+++ b/makefu/1systems/cake/config.nix
@@ -1,9 +1,16 @@
 { config, lib, pkgs, ... }:
-{
+let
+  primaryInterface = "eth0";
+in {
   imports = [
     <stockholm/makefu>
     ./hardware-config.nix
-    <stockholm/makefu/2configs/tools/core.nix>
+    # <stockholm/makefu/2configs/tools/core.nix>
+    { environment.systemPackages = with pkgs;[ rsync screen curl git ];}
+    <stockholm/makefu/2configs/binary-cache/nixos.nix>
+    #<stockholm/makefu/2configs/support-nixos.nix>
+    <stockholm/makefu/2configs/homeautomation/default.nix>
+    <stockholm/makefu/2configs/homeautomation/google-muell.nix>
 # configure your hw:
 # <stockholm/makefu/2configs/save-diskspace.nix>
   ];
@@ -12,7 +19,7 @@
     tinc.retiolum.enable = true;
     build.host = config.krebs.hosts.cake;
   };
-
+  networking.firewall.trustedInterfaces = [ primaryInterface ];
   documentation.info.enable = false;
   documentation.man.enable = false;
   services.nixosManual.enable = false;
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index e274b4bf8..7bc06f833 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -84,6 +84,7 @@ in {
       <stockholm/makefu/2configs/shack/events-publisher>
       <stockholm/makefu/2configs/shack/gitlab-runner>
       <stockholm/makefu/2configs/remote-build/slave.nix>
+      <stockholm/makefu/2configs/remote-build/aarch64-community.nix>
       <stockholm/makefu/2configs/taskd.nix>
 
       # services
diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hardware-config.nix
index 542b79fe7..857fad7aa 100644
--- a/makefu/1systems/gum/hardware-config.nix
+++ b/makefu/1systems/gum/hardware-config.nix
@@ -41,36 +41,36 @@ in {
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
   boot.loader.grub.devices = [ main-disk ];
-  boot.initrd.kernelModules = [  "dm-raid" ];
+  boot.initrd.kernelModules = [  "dm-raid" "dm_cache" ];
   boot.initrd.availableKernelModules = [
     "ata_piix" "vmw_pvscsi" "virtio_pci" "sd_mod" "ahci"
     "xhci_pci" "ehci_pci" "ahci" "sd_mod"
   ];
-  boot.kernelModules = [ "dm-thin-pool" "kvm-intel"  ];
+  boot.kernelModules = [ "dm-raid" "dm_cache" "dm-thin-pool" "kvm-intel"  ];
   hardware.enableRedistributableFirmware = true;
   fileSystems."/" = {
-    device = "/dev/mapper/nixos-root";
+    device = "/dev/nixos/root";
     fsType = "ext4";
   };
   fileSystems."/var/lib" = {
-    device = "/dev/mapper/nixos-lib";
+    device = "/dev/nixos/lib";
     fsType = "ext4";
   };
   fileSystems."/var/log" = {
-    device = "/dev/mapper/nixos-log";
+    device = "/dev/nixos/log";
     fsType = "ext4";
   };
   fileSystems."/var/download" = {
-    device = "/dev/mapper/nixos-download";
+    device = "/dev/nixos/download";
     fsType = "ext4";
   };
   fileSystems."/var/www/binaergewitter" = {
-    device = "/dev/mapper/nixos-binaergewitter";
+    device = "/dev/nixos/binaergewitter";
     fsType = "ext4";
-    options = [ "nofail" ];
+    options = [ "nofail" "x-systemd.automount" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ];
   };
   fileSystems."/var/lib/borgbackup" = {
-    device = "/dev/mapper/nixos-backup";
+    device = "/dev/nixos/backup";
     fsType = "ext4";
   };
   fileSystems."/boot" = {
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix
index 138735d91..ceeccc0b2 100644
--- a/makefu/1systems/x/config.nix
+++ b/makefu/1systems/x/config.nix
@@ -15,6 +15,13 @@
       <stockholm/makefu/2configs/extra-fonts.nix>
       <stockholm/makefu/2configs/tools/all.nix>
       <stockholm/makefu/2configs/dict.nix>
+      #<stockholm/makefu/3modules/netboot_server.nix>
+      #{
+      #  netboot_server = {
+      #    network.wan = "wlp3s0";
+      #    network.lan = "enp0s25";
+      #  };
+      #}
 
       <stockholm/makefu/2configs/backup/state.nix>
       # <stockholm/makefu/2configs/dnscrypt/client.nix>
@@ -52,21 +59,23 @@
       # Virtualization
       <stockholm/makefu/2configs/virtualisation/libvirt.nix>
       <stockholm/makefu/2configs/virtualisation/docker.nix>
-      <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
-      {
-        networking.firewall.allowedTCPPorts = [ 8080 ];
-        networking.nat = {
-          enable = true;
-          externalInterface = "wlp3s0";
-          internalInterfaces = [ "vboxnet0" ];
-        };
-      }
+      # <stockholm/makefu/2configs/virtualisation/virtualbox.nix>
+      #{
+      #  networking.firewall.allowedTCPPorts = [ 8080 ];
+      #  networking.nat = {
+      #    enable = true;
+      #    externalInterface = "wlp3s0";
+      #    internalInterfaces = [ "vboxnet0" ];
+      #  };
+      #}
       # Services
       <stockholm/makefu/2configs/git/brain-retiolum.nix>
       <stockholm/makefu/2configs/tor.nix>
       <stockholm/makefu/2configs/vpn/vpngate.nix>
       # <stockholm/makefu/2configs/buildbot-standalone.nix>
       <stockholm/makefu/2configs/remote-build/aarch64-community.nix>
+      <stockholm/makefu/2configs/remote-build/gum.nix>
+      { nixpkgs.overlays = [ (self: super: super.prefer-remote-fetch self super) ]; }
 
       # Hardware
       <stockholm/makefu/2configs/hw/tp-x230.nix>
@@ -162,7 +171,6 @@
     "/home/makefu/docs"
     "/home/makefu/.password-store"
     "/home/makefu/.secrets-pass"
-    "/home/makefu/autosync/Database.kdb"
   ];
 
   services.syncthing.user = lib.mkForce "makefu";