Merge remote-tracking branch 'gum/master'

87 files changed, 1775 insertions, 1033 deletions

diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
index 8b9812cf4..b9550cb2e 100644
--- a/makefu/1systems/cake/config.nix
+++ b/makefu/1systems/cake/config.nix
@@ -14,8 +14,15 @@ in {
     #<stockholm/makefu/2configs/support-nixos.nix>
     # <stockholm/makefu/2configs/homeautomation/default.nix>
     # <stockholm/makefu/2configs/homeautomation/google-muell.nix>
+    # <stockholm/makefu/2configs/hw/pseyecam.nix>
     # configure your hw:
     # <stockholm/makefu/2configs/save-diskspace.nix>
+
+    # directly use the alsa device instead of attaching to pulse
+
+    <stockholm/makefu/2configs/audio/respeaker.nix>
+    <stockholm/makefu/2configs/home/rhasspy/default.nix>
+    <stockholm/makefu/2configs/home/rhasspy/led-control.nix>
   ];
   krebs = {
     enable = true;
@@ -28,5 +35,4 @@ in {
   documentation.info.enable = false;
   documentation.man.enable = false;
   documentation.nixos.enable = false;
-  sound.enable = false;
 }
diff --git a/makefu/1systems/cake/hardware-config.nix b/makefu/1systems/cake/hardware-config.nix
index a0cd4fac1..932aa1929 100644
--- a/makefu/1systems/cake/hardware-config.nix
+++ b/makefu/1systems/cake/hardware-config.nix
@@ -10,5 +10,6 @@
       options = [ "noatime" ];
     };
   };
-  #hardware.raspberry-pi."4".fkms-3d.enable = true; 
+  hardware.raspberry-pi."4".fkms-3d.enable = true; 
+  hardware.raspberry-pi."4".audio.enable = true;  
 }
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 26bfd0731..f40f113bb 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -10,6 +10,12 @@ in {
       <stockholm/makefu>
       ./hetznercloud
       {
+        # wait for mount
+        systemd.services.rtorrent.wantedBy = lib.mkForce [];
+        systemd.services.phpfpm-nextcloud.wantedBy = lib.mkForce [];
+        systemd.services.samba-smbd.wantedBy = lib.mkForce [];
+      }
+      {
         users.users.lass = {
           uid = 19002;
           isNormalUser = true;
@@ -103,6 +109,7 @@ in {
       # <stockholm/makefu/2configs/sabnzbd.nix>
       # <stockholm/makefu/2configs/mail/mail.euer.nix>
       { krebs.exim.enable = mkDefault true; }
+      <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
 
       # sharing
       <stockholm/makefu/2configs/share/gum.nix> # samba sahre
@@ -125,7 +132,7 @@ in {
       <stockholm/makefu/2configs/backup/server.nix>
       <stockholm/makefu/2configs/backup/state.nix>
       <stockholm/makefu/2configs/wireguard/server.nix>
-      # <stockholm/makefu/2configs/wireguard/wiregrill.nix>
+      <stockholm/makefu/2configs/wireguard/wiregrill.nix>
 
       { # recent changes mediawiki bot
         networking.firewall.allowedUDPPorts = [ 5005 5006 ];
@@ -139,6 +146,7 @@ in {
       <stockholm/makefu/2configs/deployment/rss/rss.euer.krebsco.de.nix> # postgres backend
       <stockholm/makefu/2configs/deployment/rss/ratt.nix>
 
+      <stockholm/makefu/2configs/deployment/ntfysh.nix>
       <stockholm/makefu/2configs/deployment/owncloud.nix> #postgres backend
       ### Moving owncloud data dir to /media/cloud/nextcloud-data
       {
@@ -173,7 +181,7 @@ in {
       # <stockholm/makefu/2configs/nginx/iso.euer.nix>
 
       # <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix>
-      <stockholm/makefu/2configs/deployment/graphs.nix>
+      # <stockholm/makefu/2configs/deployment/graphs.nix>
       #<stockholm/makefu/2configs/deployment/owncloud.nix>
       # <stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix>
       #<stockholm/makefu/2configs/deployment/feed.euer.krebsco.de>
@@ -184,7 +192,7 @@ in {
       <stockholm/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix>
       # <stockholm/makefu/2configs/deployment/systemdultras-rss.nix>
 
-      # <stockholm/makefu/2configs/shiori.nix>
+      <stockholm/makefu/2configs/shiori.nix>
       #<stockholm/makefu/2configs/workadventure>
 
       <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
diff --git a/makefu/1systems/gum/hetznercloud/network.nix b/makefu/1systems/gum/hetznercloud/network.nix
index 24fe3842f..5159cf570 100644
--- a/makefu/1systems/gum/hetznercloud/network.nix
+++ b/makefu/1systems/gum/hetznercloud/network.nix
@@ -3,7 +3,7 @@ let
   external-mac = "96:00:01:24:33:f4";
   external-gw = "172.31.1.1";
   external-ip = "142.132.189.140";
-  external-ip6 = "2a01:4f8:1c17:5cdf::2/64";
+  external-ip6 = "2a01:4f8:1c17:5cdf::2";
   external-gw6 = "fe80::1";
   external-netmask = 32;
   external-netmask6 = 64;
@@ -16,19 +16,20 @@ in
     SUBSYSTEM=="net", ATTR{address}=="${external-mac}", NAME="${ext-if}"
   '';
   networking = {
+    enableIPv6 = true;
+    nat.enableIPv6 = true;
     interfaces."${ext-if}" = {
       useDHCP = true;
+      ipv6.addresses = [{
+          address = external-ip6;
+          prefixLength = external-netmask6;
+      }];
     };
     #ipv4.addresses = [{
     #  address = external-ip;
     #  prefixLength = external-netmask;
     #}];
-    #ipv6.addresses = [{
-    #    address = external-ip6;
-    #    prefixLength = external-netmask6;
-    #  }];
-    #};
-    #defaultGateway6 = { address = external-gw6; interface = ext-if; };
+    defaultGateway6 = { address = external-gw6; interface = ext-if; };
     #defaultGateway = external-gw;
     nameservers = [ "1.1.1.1" ];
   };
diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index 44fa14812..9a242a41b 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -32,8 +32,6 @@ in {
       <stockholm/makefu/2configs/share>
       # <stockholm/makefu/2configs/share/hetzner-client.nix>
 
-      # Services:
-      <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
 
       # torrent is managed by gum
       # <stockholm/makefu/2configs/torrent/rtorrent.nix>
diff --git a/makefu/1systems/minicake/config.nix b/makefu/1systems/minicake/config.nix
new file mode 100644
index 000000000..fe66679ad
--- /dev/null
+++ b/makefu/1systems/minicake/config.nix
@@ -0,0 +1,27 @@
+{ config,nixpkgsPath, pkgs, lib, ... }:
+{
+  krebs = {
+    enable = true;
+
+    dns.providers.lan  = "hosts";
+    build.user = config.krebs.users.makefu;
+  };
+  imports = [
+    (nixpkgsPath + "/nixos/modules/profiles/minimal.nix")
+    (nixpkgsPath + "/nixos/modules/profiles/installation-device.nix")
+  ];
+
+  # cifs-utils fails to cross-compile
+  # Let's simplify this by removing all unneeded filesystems from the image.
+  boot.supportedFilesystems = lib.mkForce [ "vfat" ];
+
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+
+
+  users.users = {
+    root = {
+        openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
+      };
+  };
+  services.openssh.enable = true;
+}
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 3ff1d0238..224e170dd 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -54,17 +54,19 @@ in {
       <stockholm/makefu/2configs/share/omo.nix>
       <stockholm/makefu/2configs/share/gum-client.nix>
       <stockholm/makefu/2configs/sync>
-      <stockholm/makefu/2configs/dcpp/airdcpp.nix>
-      { krebs.airdcpp.dcpp.shares = let
-          d = path: "/media/cryptX/${path}";
-        in {
-          emu.path = d "emu";
-          audiobooks.path = lib.mkForce (d "audiobooks");
-          incoming.path = lib.mkForce (d "torrent");
-          anime.path = d "anime";
-        };
-        krebs.airdcpp.dcpp.DownloadDirectory = "/media/cryptX/torrent/dcpp";
-      }
+
+      <stockholm/makefu/2configs/wireguard/wiregrill.nix>
+      #<stockholm/makefu/2configs/dcpp/airdcpp.nix>
+      #{ krebs.airdcpp.dcpp.shares = let
+      #    d = path: "/media/cryptX/${path}";
+      #  in {
+      #    emu.path = d "emu";
+      #    audiobooks.path = lib.mkForce (d "audiobooks");
+      #    incoming.path = lib.mkForce (d "torrent");
+      #    anime.path = d "anime";
+      #  };
+      #  krebs.airdcpp.dcpp.DownloadDirectory = "/media/cryptX/torrent/dcpp";
+      #}
       {
         # copy config from <secrets/sabnzbd.ini> to /var/lib/sabnzbd/
         #services.sabnzbd.enable = true;
@@ -84,12 +86,12 @@ in {
       <stockholm/makefu/2configs/stats/telegraf>
       # <stockholm/makefu/2configs/stats/telegraf/europastats.nix>
       <stockholm/makefu/2configs/stats/telegraf/hamstats.nix>
-      # <stockholm/makefu/2configs/stats/arafetch.nix>
+      <stockholm/makefu/2configs/hw/cdrip.nix>
 
       # services
       {
         services.nginx.enable = true;
-        networking.firewall.allowedTCPPorts = [ 80 ];
+        networking.firewall.allowedTCPPorts = [ 80 8123 ];
       }
       # <stockholm/makefu/2configs/syncthing.nix>
       <stockholm/makefu/2configs/remote-build/slave.nix>
@@ -100,10 +102,11 @@ in {
       <stockholm/makefu/2configs/home/jellyfin.nix>
       <stockholm/makefu/2configs/home/music.nix>
       <stockholm/makefu/2configs/home/photoprism.nix>
-      <stockholm/makefu/2configs/home/tonie.nix>
+      # <stockholm/makefu/2configs/home/tonie.nix>
       <stockholm/makefu/2configs/home/ps4srv.nix>
       # <stockholm/makefu/2configs/home/metube.nix>
-      <stockholm/makefu/2configs/home/ham>
+      # <stockholm/makefu/2configs/home/ham>
+      <stockholm/makefu/2configs/home/ham/docker.nix>
       <stockholm/makefu/2configs/home/zigbee2mqtt>
       {
         makefu.ps3netsrv = {
diff --git a/makefu/1systems/snake/config.nix b/makefu/1systems/snake/config.nix
index 1c6068e98..69e347d71 100644
--- a/makefu/1systems/snake/config.nix
+++ b/makefu/1systems/snake/config.nix
@@ -10,7 +10,7 @@ in {
     <stockholm/makefu/2configs/binary-cache/nixos.nix>
 
     <stockholm/makefu/2configs/home/rhasspy>
-    <stockholm/makefu/2configs/home/rhasspy/led-control.nix>
+    # <stockholm/makefu/2configs/hw/pseyecam.nix>
   ];
   krebs = {
     enable = true;
diff --git a/makefu/1systems/snake/hardware-config.nix b/makefu/1systems/snake/hardware-config.nix
index 827c1d3eb..88124f659 100644
--- a/makefu/1systems/snake/hardware-config.nix
+++ b/makefu/1systems/snake/hardware-config.nix
@@ -2,6 +2,8 @@
 {
   imports = [ 
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    ./wifi.nix
+    ./sound.nix
   ];
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
@@ -18,4 +20,5 @@
 
   boot.kernelParams = [ "net.ifnames=0" ];
   networking.hostId = "0123AABB";
+
 }
diff --git a/makefu/1systems/snake/sound.nix b/makefu/1systems/snake/sound.nix
new file mode 100644
index 000000000..452f4b4b1
--- /dev/null
+++ b/makefu/1systems/snake/sound.nix
@@ -0,0 +1,51 @@
+{ lib, ... }: {
+  imports = [ 
+    <stockholm/makefu/2configs/gui/snake-kiosk.nix> 
+  ];
+  nixpkgs.config