1 files changed, 49 insertions, 80 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 35a3d799..5ae372c1 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -7,10 +7,6 @@ let
 
   niri = cfg.package;
   terminal = lib.getExe config.programs.kitty.package;
-  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";
@@ -165,12 +161,6 @@ let
   with-urgent-window-action = config.lib.niri.actions.spawn (lib.getExe (with_predicate_window ".is_urgent"));
   with-focused-window-action = config.lib.niri.actions.spawn (lib.getExe (with_predicate_window ".is_focused"));
 in {
-  imports = [
-    ./waybar.nix
-    ./mako.nix
-    ./swayosd.nix
-  ];
-
   options = {
     programs.niri.scratchspaces = lib.mkOption {
       type = lib.types.listOf (lib.types.submodule ({ config, ... }: {
@@ -231,36 +221,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" ];
-      };
-    };
-
-    services.swayidle = {
-      events = [
-        { event = "after-resume"; command = "${lib.getExe niri} msg action power-on-monitors"; }
-      ];
-      timeouts = [
-        { timeout = 540;
-          command = "${lib.getExe niri} msg action power-off-monitors";
-        }
-      ];
-    };
+    home.packages = [ pkgs.xwayland-satellite-unstable ];
 
     systemd.user.sockets.niri-workspace-history = {
       Socket = {
@@ -747,7 +708,7 @@ in {
 
           (plain "layer-rule" [
             (sleaf "match" { namespace = "^notifications$"; })
-            (sleaf "match" { namespace = "^waybar$"; })
+            (sleaf "match" { namespace = "^bar$"; })
             (sleaf "match" { namespace = "^launcher$"; })
             (sleaf "block-out-from" "screencast")
           ])
@@ -939,66 +900,74 @@ in {
                   "Mod+Right".action = set-column-width "+10%";
 
                   "Mod+Shift+Z" = {
-                    action = spawn (lib.getExe niri) "msg" "action" "power-off-monitors";
+                    action = power-off-monitors;
                     allow-when-locked = true;
                   };
-                  "Mod+Shift+L".action = spawn loginctl "lock-session";
                   "Mod+Shift+E".action = quit;
-                  "Mod+Shift+Minus" = {
-                    action = spawn systemctl "suspend";
+
+                  # "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";
+                  # "Mod+Comma".action = spawn makoctl "restore";
+
+                  "Mod+Control+W".action = with-empty-unnamed-workspace-action "{\"Action\":{\"FocusWorkspace\":{\"reference\":{\"Id\": $workspace_id}}}}";
+                  "Mod+Control+Shift+W".action = with-empty-unnamed-workspace-action "{\"Action\":{\"MoveColumnToWorkspace\":{\"reference\":{\"Id\": $workspace_id}, \"focus\": true}}}";
+
+                  "Mod+X".action = set-dynamic-cast-window;
+                  "Mod+Shift+X".action = set-dynamic-cast-monitor;
+                  "Mod+Control+Shift+X".action = clear-dynamic-cast-target;
+
+                  "Mod+D".action = with-urgent-window-action "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}";
+                  "Mod+Shift+D".action = with-focused-window-action "{\"Action\":{\"UnsetUrgent\":{\"id\": .id}}}";
+
+                  "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"; };
                   };
-                  "Mod+Shift+Control+Minus" = {
-                    action = spawn systemctl "hibernate";
+                  "XF86AudioLowerVolume" = {
                     allow-when-locked = true;
+                    action = shell { Volume.volume = "down"; };
                   };
-                  "Mod+Shift+P" = {
-                    action = spawn (lib.getExe pkgs.playerctl) "-a" "pause";
+                  "XF86AudioMute" = {
                     allow-when-locked = true;
+                    action = shell { Volume.muted = "toggle"; };
                   };
-
-                  "XF86MonBrightnessUp" = {
-                    action = spawn swayosd-client "--brightness" "raise";
+                  "XF86AudioMicMute" = {
                     allow-when-locked = true;
+                    action = shell { Volume."mic-muted" = "toggle"; };
                   };
-                  "XF86MonBrightnessDown" = {
-                    action = spawn swayosd-client "--brightness" "lower";
+                  "XF86MonBrightnessUp" = {
+                    action = shell { Brightness = "up"; };
                     allow-when-locked = true;
                   };
-                  "XF86AudioRaiseVolume" = {
-                    action = spawn swayosd-client "--output-volume" "raise";
+                  "XF86MonBrightnessDown" = {
+                    action = shell { Brightness = "down"; };
                     allow-when-locked = true;
                   };
-                  "XF86AudioLowerVolume" = {
-                    action = spawn swayosd-client "--output-volume" "lower";
+                  "Mod+Shift+L".action = shell { LockSession = {}; };
+                  "Mod+Shift+Minus" = {
+                    action = shell { Suspend = {}; };
                     allow-when-locked = true;
                   };
-                  "XF86AudioMute" = {
-                    action = spawn swayosd-client "--output-volume" "mute-toggle";
+                  "Mod+Shift+Control+Minus" = {
+                    action = shell { Hibernate = {}; };
                     allow-when-locked = true;
                   };
-                  "XF86AudioMicMute" = {
-                    action = spawn swayosd-client "--input-volume" "mute-toggle";
+                  "Mod+Shift+P" = {
+                    action = shell { Mpris = { PauseAll = {}; }; };
                     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";
-                  "Mod+Comma".action = spawn makoctl "restore";
-
-                  "Mod+Control+W".action = with-empty-unnamed-workspace-action "{\"Action\":{\"FocusWorkspace\":{\"reference\":{\"Id\": $workspace_id}}}}";
-                  "Mod+Control+Shift+W".action = with-empty-unnamed-workspace-action "{\"Action\":{\"MoveColumnToWorkspace\":{\"reference\":{\"Id\": $workspace_id}, \"focus\": true}}}";
-
-                  "Mod+X".action = set-dynamic-cast-window;
-                  "Mod+Shift+X".action = set-dynamic-cast-monitor;
-                  "Mod+Control+Shift+X".action = clear-dynamic-cast-target;
-
-                  "Mod+D".action = with-urgent-window-action "{\"Action\":{\"FocusWindow\":{\"id\": .id}}}";
-                  "Mod+Shift+D".action = with-focused-window-action "{\"Action\":{\"UnsetUrgent\":{\"id\": .id}}}";
-
-                  "Mod+K".action = spawn (lib.getExe' pkgs.worktime "worktime-ui");
-                  "Mod+Shift+K".action = spawn (lib.getExe' pkgs.worktime "worktime-stop");
+                  "Mod+Semicolon".action = shell { Notifications = { DismissGroup = {}; }; };
+                  "Mod+Shift+Semicolon".action = shell { Notifications = { DismissAll = {}; }; };
                 }))
                 (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)