ma gui: pulseaudio -> pipewire

2 files changed, 25 insertions, 26 deletions

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: