1 files changed, 8 insertions, 11 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 1ff149bc..10b85169 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -10,7 +10,6 @@ let
   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";
@@ -168,7 +167,6 @@ in {
   imports = [
     ./waybar.nix
     ./mako.nix
-    ./swayosd.nix
   ];
 
   options = {
@@ -939,15 +937,6 @@ in {
                     allow-when-locked = true;
                   };
 
-                  "XF86MonBrightnessUp" = {
-                    action = spawn swayosd-client "--brightness" "raise";
-                    allow-when-locked = true;
-                  };
-                  "XF86MonBrightnessDown" = {
-                    action = spawn swayosd-client "--brightness" "lower";
-                    allow-when-locked = true;
-                  };
-
                   "Mod+Semicolon".action = spawn makoctl "dismiss" "--group";
                   "Mod+Shift+Semicolon".action = spawn makoctl "dismiss" "--all";
                   "Mod+Period".action = spawn makoctl "menu" "--" (lib.getExe config.programs.fuzzel.package) "--dmenu";
@@ -988,6 +977,14 @@ in {
                     allow-when-locked = true;
                     action = shell { Volume."mic-muted" = "toggle"; };
                   };
+                  "XF86MonBrightnessUp" = {
+                    action = shell { Brightness = "up"; };
+                    allow-when-locked = true;
+                  };
+                  "XF86MonBrightnessDown" = {
+                    action = shell { Brightness = "down"; };
+                    allow-when-locked = true;
+                  };
                 }))
                 (map ({ name, selector, spawn, key, ...}: if key != null && selector != null && spawn != null then bind key { action = focus-or-spawn-action selector name spawn; } else null) cfg.scratchspaces)
                 (map ({ name, moveKey, ...}: if moveKey != null then bind moveKey { action = kdl.magic-leaf "move-column-to-workspace" name; } else null) cfg.scratchspaces)