2 files changed, 19 insertions, 12 deletions

diff --git a/services/default.nix b/services/default.nix
index bef7c85..a45f53a 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -1,6 +1,7 @@
 { config
 , pkgs
 , theme
+, font
 , ...
 }:
 
@@ -24,5 +25,4 @@
       pinentryPackage = pkgs.pinentry-tty;
     };
   };
-
 }
diff --git a/services/sxhkd.nix b/services/sxhkd.nix
index d8678af..fab1316 100644
--- a/services/sxhkd.nix
+++ b/services/sxhkd.nix
@@ -10,8 +10,8 @@ let
       ${pkgs.libnotify}/bin/notify-send ${text} -h int:value:${value} -h string:synchronous:volume -h string:hlcolor:"${theme.base0C}"
     '';
   volume = pkgs.writeScriptBin "volume" ''
-    ${pkgs.alsaUtils}/bin/amixer $@
-    v=$(${pkgs.alsaUtils}/bin/amixer sget Master | ${pkgs.gawk}/bin/awk -F"[][%]" '/Left:/ {print $2}')
+    ${pkgs.alsa-utils}/bin/amixer $@
+    v=$(${pkgs.alsa-utils}/bin/amixer sget Master | ${pkgs.gawk}/bin/awk -F"[][%]" '/Left:/ {print $2}')
     ${progress "volume" "$v"}
   '';
 
@@ -19,14 +19,21 @@ in
 {
   services.sxhkd = {
     enable = true;
-    keybindings = {
-      "super + slash" = "${pkgs.light}/bin/light -A 2";
-      "super + shift + slash" = "${pkgs.light}/bin/light -U 2";
-      "super + semicolon" = "${volume}/bin/volume sset Master 2%+";
-      "super + shift + semicolon" = "${volume}/bin/volume sset Master 2%-";
-      "super + ctrl  + space" = "${pkgs.dunst}/bin/dunstctl close";
-      "super + shift + space" = "${pkgs.dunst}/bin/dunstctl history-pop";
-      "super + ctrl  + shift + space" = "${pkgs.dunst}/bin/dunstctl close-all";
-    };
+    keybindings =
+      let
+        vol_up = "${volume}/bin/volume sset Master 2%+";
+        vol_down = "${volume}/bin/volume sset Master 2%-";
+      in
+      {
+        "super + slash" = "${pkgs.light}/bin/light -A 2";
+        "super + shift + slash" = "${pkgs.light}/bin/light -U 2";
+        "super + semicolon" = vol_up;
+        "super + shift + semicolon" = vol_down;
+        "XF86AudioRaiseVolume" = vol_up;
+        "XF86AudioLowerVolume" = vol_down;
+        "super + ctrl  + space" = "${pkgs.dunst}/bin/dunstctl close";
+        "super + shift + space" = "${pkgs.dunst}/bin/dunstctl history-pop";
+        "super + ctrl  + shift + space" = "${pkgs.dunst}/bin/dunstctl close-all";
+      };
   };
 }