1 files changed, 28 insertions, 27 deletions

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 10b85169..3c29b83c 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -165,7 +165,6 @@ let
   with-focused-window-action = config.lib.niri.actions.spawn (lib.getExe (with_predicate_window ".is_focused"));
 in {
   imports = [
-    ./waybar.nix
     ./mako.nix
   ];
 
@@ -231,17 +230,6 @@ in {
   config = {
     home.packages = [ pkgs.xwayland-satellite-unstable ];
 
-    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";
-        }
-      ];
-    };
-
     systemd.user.sockets.niri-workspace-history = {
       Socket = {
         ListenStream = "%t/niri-workspace-history.sock";
@@ -727,7 +715,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")
           ])
@@ -919,23 +907,23 @@ 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+L".action = spawn loginctl "lock-session";
                   "Mod+Shift+E".action = quit;
-                  "Mod+Shift+Minus" = {
-                    action = spawn systemctl "suspend";
-                    allow-when-locked = true;
-                  };
-                  "Mod+Shift+Control+Minus" = {
-                    action = spawn systemctl "hibernate";
-                    allow-when-locked = true;
-                  };
-                  "Mod+Shift+P" = {
-                    action = spawn (lib.getExe pkgs.playerctl) "-a" "pause";
-                    allow-when-locked = true;
-                  };
+                  # "Mod+Shift+Minus" = {
+                  #   action = spawn systemctl "suspend";
+                  #   allow-when-locked = true;
+                  # };
+                  # "Mod+Shift+Control+Minus" = {
+                  #   action = spawn systemctl "hibernate";
+                  #   allow-when-locked = true;
+                  # };
+                  # "Mod+Shift+P" = {
+                  #   action = spawn (lib.getExe pkgs.playerctl) "-a" "pause";
+                  #   allow-when-locked = true;
+                  # };
 
                   "Mod+Semicolon".action = spawn makoctl "dismiss" "--group";
                   "Mod+Shift+Semicolon".action = spawn makoctl "dismiss" "--all";
@@ -985,6 +973,19 @@ in {
                     action = shell { Brightness = "down"; };
                     allow-when-locked = true;
                   };
+                  "Mod+Shift+L".action = shell { LockSession = {}; };
+                  "Mod+Shift+Minus" = {
+                    action = shell { Suspend = {}; };
+                    allow-when-locked = true;
+                  };
+                  "Mod+Shift+Control+Minus" = {
+                    action = shell { Hibernate = {}; };
+                    allow-when-locked = true;
+                  };
+                  "Mod+Shift+P" = {
+                    action = shell { Mpris = { PauseAll = {}; }; };
+                    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)