From 1251d4e050f50c874b728415a27d774873d4ac90 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sat, 28 May 2022 02:13:16 -0400
Subject: [PATCH] tweak(audio,qtile): use sound.mediaKeys

---
 modules/modules/hardware/audio.nix      |  8 +++++++-
 users/infinidoge/config/qtile/config.py | 17 -----------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/modules/modules/hardware/audio.nix b/modules/modules/hardware/audio.nix
index b9b4108..65b4b3e 100644
--- a/modules/modules/hardware/audio.nix
+++ b/modules/modules/hardware/audio.nix
@@ -12,8 +12,14 @@ in
   };
 
   config = mkIf cfg.enable {
-    sound.enable = true;
     hardware.pulseaudio.enable = true;
+    sound = {
+      enable = true;
+      mediaKeys = {
+        enable = true;
+        volumeStep = "2%";
+      };
+    };
 
     # HACK Prevents ~/.esd_auth files by disabling the esound protocol module
     #      for pulseaudio, which I likely don't need. Is there a better way?
diff --git a/users/infinidoge/config/qtile/config.py b/users/infinidoge/config/qtile/config.py
index 55cfe57..ba23351 100644
--- a/users/infinidoge/config/qtile/config.py
+++ b/users/infinidoge/config/qtile/config.py
@@ -323,23 +323,6 @@ keys = [
         ],
     ),
 
-    # Volume
-    Key(
-        [], "XF86AudioRaiseVolume",
-        lazy.spawn("amixer set Master 2%+"),
-        desc="Raise volume",
-    ),
-    Key(
-        [], "XF86AudioLowerVolume",
-        lazy.spawn("amixer set Master 2%-"),
-        desc="Lower volume",
-    ),
-    Key(
-        [], "XF86AudioMute",
-        lazy.spawn("amixer set Master toggle"),
-        desc="Toggle mute",
-    ),
-
     # Brightness
     *optional_list(
         LAPTOP,