1 files changed, 32 insertions, 46 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 35a3d799..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 = {
@@ -231,25 +229,7 @@ in {
   };
 
   config = {
-    systemd.user.services.xwayland-satellite = {
-      Unit = {
-        BindsTo = [ "graphical-session.target" ];
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session.target" ];
-        Requisite = [ "graphical-session.target" ];
-      };
-      Service = {
-        Type = "notify";
-        NotifyAccess = "all";
-        Environment = [ "DISPLAY=:0" ];
-        ExecStart = ''${lib.getExe pkgs.xwayland-satellite-unstable} ''${DISPLAY}'';
-        ExecStartPre = "${systemctl} --user import-environment DISPLAY";
-        StandardOutput = "journal";
-      };
-      Install = {
-        WantedBy = [ "graphical-session.target" ];
-      };
-    };
+    home.packages = [ pkgs.xwayland-satellite-unstable ];
 
     services.swayidle = {
       events = [
@@ -957,31 +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;
-                  };
-                  "XF86AudioRaiseVolume" = {
-                    action = spawn swayosd-client "--output-volume" "raise";
-                    allow-when-locked = true;
-                  };
-                  "XF86AudioLowerVolume" = {
-                    action = spawn swayosd-client "--output-volume" "lower";
-                    allow-when-locked = true;
-                  };
-                  "XF86AudioMute" = {
-                    action = spawn swayosd-client "--output-volume" "mute-toggle";
-                    allow-when-locked = true;
-                  };
-                  "XF86AudioMicMute" = {
-                    action = spawn swayosd-client "--input-volume" "mute-toggle";
-                    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";
@@ -1000,6 +955,37 @@ in {
                   "Mod+K".action = spawn (lib.getExe' pkgs.worktime "worktime-ui");
                   "Mod+Shift+K".action = spawn (lib.getExe' pkgs.worktime "worktime-stop");
                 }))
+                (lib.mapAttrsToList (name: cfg: node name [(lib.removeAttrs cfg ["action"])] [cfg.action]) (let
+                  shell = obj: leaf "send-unix" [
+                    { path = ''''${XDG_RUNTIME_DIR}/shell.sock''; }
+                    (builtins.toJSON obj + "\n")
+                  ];
+                in {
+                  "XF86AudioRaiseVolume" = {
+                    allow-when-locked = true;
+                    action = shell { Volume.volume = "up"; };
+                  };
+                  "XF86AudioLowerVolume" = {
+                    allow-when-locked = true;
+                    action = shell { Volume.volume = "down"; };
+                  };
+                  "XF86AudioMute" = {
+                    allow-when-locked = true;
+                    action = shell { Volume.muted = "toggle"; };
+                  };
+                  "XF86AudioMicMute" = {
+                    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)
               ]