9 files changed, 56 insertions, 32 deletions
diff --git a/makefu/2configs/bgt/template.md b/makefu/2configs/bgt/template.md
index 8413e0b8b..1dfb0b42f 100644
--- a/makefu/2configs/bgt/template.md
+++ b/makefu/2configs/bgt/template.md
@@ -6,7 +6,7 @@
    - Felix1      makefu@studio.link
    - L33tFelix   l33tname@studio.link
    - Ingo        ingo@studio.link
-2.  Jitis an machen https://meet.ffmuc.net/bgt  (mittel)
+2.  Jitis an machen https://meet.ffmuc.net/bgt-aktuell  (mittel)
 3.  studio-link aufnehmen drücken (wichtig)
 4.  audiocity starten, 48000Hz einstellen, Audio-Device checken und aufnehmen drücken (wichtig)
 4.  alternative parecord:
@@ -28,6 +28,8 @@
 
 ## Untoter der Woche
 
+## AI der Woche
+
 ## News
 
 ## Themen
diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index b660720e5..36c67c7f0 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -23,9 +23,11 @@ in {
   fileSystems."/var/lib/nextcloud/data" = {
     device = "/media/cloud/nextcloud-data";
     options = [ "bind" ];
+    depends = [ "/media/cloud" ];
   };
 
 
+
   krebs.secret.files.nextcloud-db-pw = {
     path = dbpw;
     owner.name = "nextcloud";
diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix
index 4ae816d5f..b2192c7f9 100644
--- a/makefu/2configs/gui/base.nix
+++ b/makefu/2configs/gui/base.nix
@@ -17,8 +17,10 @@ in
 {
   imports = [
     ./urxvtd.nix
+    ./pipewire.nix
   ];
 
+
   services.xserver = {
     enable = true;
     layout = "us";
@@ -49,7 +51,7 @@ in
   };
 
   users.users.${mainUser} = {
-    extraGroups = [ "audio" ];
+    extraGroups = [ "pipewire" "audio" ];
     packages = with pkgs;[
       pavucontrol
       xlockmore
@@ -57,10 +59,6 @@ in
     ];
   };
 
-  hardware.pulseaudio = {
-     enable = true;
-     # systemWide = true;
-  };
   services.xserver.displayManager.sessionCommands = let
     xdefaultsfile = pkgs.writeText "Xdefaults"  ''
       cat |derp <<EOF
@@ -79,6 +77,7 @@ in
       URxvt.urgentOnBell: true
       URxvt.visualBell: false
       URxvt.font : xft:Terminus:size=12
+      URxvt.perl-ext-common: default,-confirm-paste
 
 
       ! blue
diff --git a/makefu/2configs/gui/pipewire.nix b/makefu/2configs/gui/pipewire.nix
new file mode 100644
index 000000000..eb94f75b7
--- /dev/null
+++ b/makefu/2configs/gui/pipewire.nix
@@ -0,0 +1,21 @@
+{ config, lib, pkgs, ... }:
+# TODO test `alsactl init` after suspend to reinit mic
+{
+  security.rtkit.enable = true;
+  hardware.pulseaudio.enable = lib.mkForce false;
+
+  environment.systemPackages = with pkgs; [
+    alsaUtils
+    pulseaudio
+    ponymix
+  ];
+
+  services.pipewire = {
+    enable = true;
+    systemWide = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+}
diff --git a/makefu/2configs/home/music.nix b/makefu/2configs/home/music.nix
index 7dd8ca6e1..205b47fec 100644
--- a/makefu/2configs/home/music.nix
+++ b/makefu/2configs/home/music.nix
@@ -9,6 +9,7 @@ in
     MusicFolder = "/media/cryptX/music/kinder";
     Address = "0.0.0.0";
   };
+  systemd.services.navidrome.after = [ "media-cryptX.mount" ];
 
   state = [ "/var/lib/navidrome" ];
   # networking.firewall.allowedTCPPorts = [ 4040 ];
@@ -18,6 +19,8 @@ in
               "navidrome.lan"
       "music"  "music.lan"
       "musik" "musik.lan"
+      "music.omo.r"
+      "music.makefu.r" "music.makefu"
     ];
 
     locations."/".proxyPass = "http://localhost:${toString port}";
diff --git a/makefu/2configs/hw/bluetooth.nix b/makefu/2configs/hw/bluetooth.nix
index 171973ac5..9eda6069b 100644
--- a/makefu/2configs/hw/bluetooth.nix
+++ b/makefu/2configs/hw/bluetooth.nix
@@ -2,27 +2,27 @@
 { # bluetooth+pulse config
 # for blueman-applet
   users.users.makefu.packages = [ pkgs.blueman ];
-  hardware.pulseaudio = {
-    enable = true;
-    package = pkgs.pulseaudioFull;
-# systemWide = true;
-    support32Bit = true;
-    configFile = pkgs.writeText "default.pa" ''
-      load-module module-udev-detect
-      load-module module-bluetooth-policy
-      load-module module-bluetooth-discover
-      load-module module-native-protocol-unix
-      load-module module-always-sink
-      load-module module-console-kit
-      load-module module-systemd-login
-      load-module module-intended-roles
-      load-module module-position-event-sounds
-      load-module module-filter-heuristics
-      load-module module-filter-apply
-      load-module module-switch-on-connect
-      load-module module-switch-on-port-available
-      '';
-  };
+  #hardware.pulseaudio = {
+  #  enable = true;
+  #  package = pkgs.pulseaudioFull;
+# #systemWide = true;
+  #  support32Bit = true;
+  #  configFile = pkgs.writeText "default.pa" ''
+  #    load-module module-udev-detect
+  #    load-module module-bluetooth-policy
+  #    load-module module-bluetooth-discover
+  #    load-module module-native-protocol-unix
+  #    load-module module-always-sink
+  #    load-module module-console-kit
+  #    load-module module-systemd-login
+  #    load-module module-intended-roles
+  #    load-module module-position-event-sounds
+  #    load-module module-filter-heuristics
+  #    load-module module-filter-apply
+  #    load-module module-switch-on-connect
+  #    load-module module-switch-on-port-available
+  #    '';
+  #};
   services.blueman.enable = true;
 # presumably a2dp Sink
 # Enable profile:
diff --git a/makefu/2configs/share/hetzner-client.nix b/makefu/2configs/share/hetzner-client.nix
index dc8637361..f7afc6d57 100644
--- a/makefu/2configs/share/hetzner-client.nix
+++ b/makefu/2configs/share/hetzner-client.nix
@@ -3,10 +3,7 @@
 with <stockholm/lib>;
 let
   automount_opts =
-  [ "x-systemd.automount"
-    "noauto" "x-systemd.idle-timeout=600"
-    "x-systemd.device-timeout=5s"
-    "x-systemd.mount-timeout=5s"
+  ["nofail" "noempty"
   ];
   host = "u288834.your-storagebox.de";
 in {
diff --git a/makefu/2configs/stats/server.nix b/makefu/2configs/stats/server.nix
index 679bfd65c..82ce31a62 100644
--- a/makefu/2configs/stats/server.nix
+++ b/makefu/2configs/stats/server.nix
@@ -25,6 +25,7 @@ in {
     # meta.logging-enabled = true;
     logging.level = "info";
     http.log-enabled = true;
+    http.flux-enabled = true;
     http.write-tracing = false;
     http.suppress-write-log = true;
     data.trace-logging-enabled = false;
diff --git a/makefu/2configs/tools/steam.nix b/makefu/2configs/tools/steam.nix
index 048c1d1a3..1817e5b7c 100644
--- a/makefu/2configs/tools/steam.nix
+++ b/makefu/2configs/tools/steam.nix
@@ -4,5 +4,4 @@
     pkgs.steam
   ];
   hardware.opengl.driSupport32Bit = true;
-  hardware.pulseaudio.support32Bit = true;
 }