From 65e1ab6bff14cdf9d7ca2b46c91462da9148db72 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 25 Sep 2022 14:46:39 +0200
Subject: ma gui: pulseaudio -> pipewire

---
 makefu/2configs/gui/base.nix     |  9 ++++-----
 makefu/2configs/hw/bluetooth.nix | 42 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'makefu/2configs')

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/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:
-- 
cgit v1.2.3


From 809a10fccb3fb7a1fad93c3f8ab559f224fab626 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 25 Sep 2022 18:20:34 +0200
Subject: ma gui/pipewire: init

---
 makefu/2configs/gui/pipewire.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 makefu/2configs/gui/pipewire.nix

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/pipewire.nix b/makefu/2configs/gui/pipewire.nix
new file mode 100644
index 000000000..ed552fe2e
--- /dev/null
+++ b/makefu/2configs/gui/pipewire.nix
@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+# TODO test `alsactl init` after suspend to reinit mic
+{
+  security.rtkit.enable = true;
+
+  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;
+  };
+}
-- 
cgit v1.2.3


From a612a6bbe4209824165a7c8fd18f0309e8d5385b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 23 Oct 2022 13:43:24 +0200
Subject: ma pipewire: ensure pulseaudio is disabled

---
 makefu/2configs/gui/pipewire.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/gui/pipewire.nix b/makefu/2configs/gui/pipewire.nix
index ed552fe2e..eb94f75b7 100644
--- a/makefu/2configs/gui/pipewire.nix
+++ b/makefu/2configs/gui/pipewire.nix
@@ -2,6 +2,7 @@
 # TODO test `alsactl init` after suspend to reinit mic
 {
   security.rtkit.enable = true;
+  hardware.pulseaudio.enable = lib.mkForce false;
 
   environment.systemPackages = with pkgs; [
     alsaUtils
-- 
cgit v1.2.3


From e6513be864c7d27c36eb9d6ba504de65e48fde13 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 30 Oct 2022 08:51:18 +0100
Subject: ma music.omo: add alias

---
 makefu/2configs/home/music.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'makefu/2configs')

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}";
-- 
cgit v1.2.3