From 666464567055a2e4ba9f6bb310e901cdc27977f7 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 12 Sep 2025 22:01:51 +0200
Subject: ...

---
 accounts/gkleen@sif/niri/default.nix | 32 +++++++-------------------------
 accounts/gkleen@sif/niri/mako.nix    |  2 +-
 2 files changed, 8 insertions(+), 26 deletions(-)

(limited to 'accounts/gkleen@sif/niri')

diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 3c29b83c..5ae372c1 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -7,9 +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";
 
   focus_or_spawn = pkgs.writeShellApplication {
     name = "focus-or-spawn";
@@ -164,10 +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 = [
-    ./mako.nix
-  ];
-
   options = {
     programs.niri.scratchspaces = lib.mkOption {
       type = lib.types.listOf (lib.types.submodule ({ config, ... }: {
@@ -910,25 +903,12 @@ in {
                     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";
-                  #   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";
-                  "Mod+Period".action = spawn makoctl "menu" "--" (lib.getExe config.programs.fuzzel.package) "--dmenu";
-                  "Mod+Comma".action = spawn makoctl "restore";
+
+                  # "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}}}";
@@ -986,6 +966,8 @@ in {
                     action = shell { Mpris = { PauseAll = {}; }; };
                     allow-when-locked = true;
                   };
+                  "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)
diff --git a/accounts/gkleen@sif/niri/mako.nix b/accounts/gkleen@sif/niri/mako.nix
index 703d5f7b..3d246d96 100644
--- a/accounts/gkleen@sif/niri/mako.nix
+++ b/accounts/gkleen@sif/niri/mako.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  config = {
+  config = lib.mkIf false {
     services.mako = {
       enable = true;
       settings = {
-- 
cgit v1.2.3