[hypr] move pipewire config to hypr

ejiek · Oct 23, 2023 · 9bf31c6 · 9bf31c6
1 parent 9a83683
commit 9bf31c6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/hosts/eFrame/configuration.nix b/hosts/eFrame/configuration.nix
@@ -10,17 +10,6 @@
   # networking.useDHCP = true;
   networking.networkmanager.enable = true;
 
-  # Enable sound.
-  sound.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-  };
-
   services.logind = {
     powerKey = "ignore";
   };
@@ -60,7 +49,6 @@
     nodejs
     pandoc
     pulumi-bin
-    pw-volume
     tdesktop
     transmission
     trivy

diff --git a/hosts/ePower/configuration.nix b/hosts/ePower/configuration.nix
@@ -17,17 +17,6 @@
   };
   services.emacs.enable = false;
 
-  # Enable sound.
-  sound.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-  };
-
   services.fwupd.enable = true;
 
   programs.gamescope = {
@@ -59,7 +48,6 @@
     obs-studio
     pandoc
     pulumi-bin
-    pw-volume
     tdesktop
     transmission
     trivy

diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
@@ -42,6 +42,18 @@ in {
     security.pam.services.swaylock = {};
 
     programs.dconf.enable = true;
+
+    # Enable sound.
+    sound.enable = true;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      # If you want to use JACK applications, uncomment this
+      #jack.enable = true;
+    };
+
     home-manager.users.ejiek = {
       home.packages = with pkgs; [
         brightnessctl
@@ -50,9 +62,11 @@ in {
         hyprpaper
         hyprpicker
         notify-desktop
+        pulsemixer
         slurp # Select a region in a Wayland compositor | used for screenshots
         swaylock
         swaynotificationcenter
+        wireplumber
         wl-clipboard
       ];
 
@@ -239,9 +253,10 @@ in {
             "$mainMod, mouse_up, workspace, e-1"
 
             # Media keys
-            ",XF86AudioRaiseVolume, exec, pw-volume change '+5%'"
-            ",XF86AudioLowerVolume, exec, pw-volume change '-5%'"
-            ",XF86AudioMute, exec, pw-volume mute toggle"
+            ",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+            ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+            ",XF86AudioMute, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ toggle"
+            "$mainMod, M, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
             ",XF86MonBrightnessDown, exec, brightnessctl set '5%-'"
             ",XF86MonBrightnessUp, exec, brightnessctl set '+5%'"