Merge remote-tracking branch 'gum/master'

6 files changed, 64 insertions, 34 deletions

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index ffdd99274..0d5359989 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -131,6 +131,8 @@ in {
             "dcpp.omo.r"
             "backup.makefu.r"
             "torrent.omo.r"
+            "music.omo.r"
+            "music.makefu.r"
           ];
         };
       };
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index ff0c18795..26bfd0731 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -99,6 +99,7 @@ in {
       <stockholm/makefu/2configs/taskd.nix>
 
       # services
+      <stockholm/makefu/2configs/bitlbee.nix> # postgres backend
       # <stockholm/makefu/2configs/sabnzbd.nix>
       # <stockholm/makefu/2configs/mail/mail.euer.nix>
       { krebs.exim.enable = mkDefault true; }
@@ -144,14 +145,18 @@ in {
         users.users.nextcloud.extraGroups = [ "download" ];
         # nextcloud-setup fails as it cannot set permissions for nextcloud
         systemd.services.nextcloud-setup.serviceConfig.SuccessExitStatus = "0 1";
-        fileSystems."/var/lib/nextcloud/data" = {
-          device = "/media/cloud/nextcloud-data";
-          options = [ "bind" ];
-        };
-        fileSystems."/var/backup" = {
-          device = "/media/cloud/gum-backup";
-          options = [ "bind" ];
-        };
+        systemd.tmpfiles.rules = [
+          "L /var/lib/nextcloud/data - - - -  /media/cloud/nextcloud-data"
+          "L /var/backup - - - -  /media/cloud/gum-backup"
+        ];
+        #fileSystems."/var/lib/nextcloud/data" = {
+        #  device = "/media/cloud/nextcloud-data";
+        #  options = [ "bind" ];
+        #};
+        #fileSystems."/var/backup" = {
+        #  device = "/media/cloud/gum-backup";
+        #  options = [ "bind" ];
+        #};
       }
 
       <stockholm/makefu/2configs/nginx/dl.euer.krebsco.de.nix>
@@ -159,6 +164,7 @@ in {
       <stockholm/makefu/2configs/nginx/euer.mon.nix>
       <stockholm/makefu/2configs/nginx/euer.wiki.nix>
       <stockholm/makefu/2configs/nginx/euer.blog.nix>
+      <stockholm/makefu/2configs/nginx/music.euer.nix>
       ## <stockholm/makefu/2configs/nginx/gum.krebsco.de.nix>
       #<stockholm/makefu/2configs/nginx/public_html.nix>
       #<stockholm/makefu/2configs/nginx/update.connector.one.nix>
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..42c458275 100644
--- a/makefu/2configs/home/music.nix
+++ b/makefu/2configs/home/music.nix
@@ -18,6 +18,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: