...

1 files changed, 8 insertions, 8 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 17da42d6..f603a9f9 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -2,11 +2,10 @@
 let
   niri = config.programs.niri.package;
   terminal = lib.getExe config.programs.kitty.package;
-  lightctl = lib.getExe' config.services.avizo.package "lightctl";
-  volumectl = lib.getExe' config.services.avizo.package "volumectl";
   makoctl = lib.getExe' config.services.mako.package "makoctl";
   loginctl = lib.getExe' hostConfig.systemd.package "loginctl";
   systemctl = lib.getExe' hostConfig.systemd.package "systemctl";
+  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
 
   focus_or_spawn = pkgs.writeShellApplication {
     name = "focus-or-spawn";
@@ -122,6 +121,7 @@ in {
   imports = [
     ./waybar.nix
     ./mako.nix
+    ./swayosd.nix
   ];
 
   config = {
@@ -577,27 +577,27 @@ in {
         };
 
         "XF86MonBrightnessUp" = {
-          action = spawn lightctl "-d" "-e4" "-n1" "up";
+          action = spawn swayosd-client "--brightness" "raise";
           allow-when-locked = true;
         };
         "XF86MonBrightnessDown" = {
-          action = spawn lightctl "-d" "-e4" "-n1" "down";
+          action = spawn swayosd-client "--brightness" "lower";
           allow-when-locked = true;
         };
         "XF86AudioRaiseVolume" = {
-          action = spawn volumectl "-d" "-u" "up";
+          action = spawn swayosd-client "--output-volume" "raise";
           allow-when-locked = true;
         };
         "XF86AudioLowerVolume" = {
-          action = spawn volumectl "-d" "-u" "down";
+          action = spawn swayosd-client "--output-volume" "lower";
           allow-when-locked = true;
         };
         "XF86AudioMute" = {
-          action = spawn volumectl "-d" "toggle-mute";
+          action = spawn swayosd-client "--output-volume" "mute-toggle";
           allow-when-locked = true;
         };
         "XF86AudioMicMute" = {
-          action = spawn volumectl "-d" "-m" "toggle-mute";
+          action = spawn swayosd-client "--input-volume" "mute-toggle";
           allow-when-locked = true;
         };