4 files changed, 50 insertions, 505 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)
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 = {
diff --git a/accounts/gkleen@sif/niri/swayosd.nix b/accounts/gkleen@sif/niri/swayosd.nix
deleted file mode 100644
index 54ebb302..00000000
--- a/accounts/gkleen@sif/niri/swayosd.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ pkgs, ... }:
-{
-  config = {
-    services.swayosd = {
-      enable = true;
-      topMargin = 0.4769706078;
-      stylePath = pkgs.runCommand "style.css" {
-        passAsFile = [ "src" ];
-        src = ''
-          window#osd {
-            padding: 12px 20px;
-            border-radius: 999px;
-            border: none;
-            background: rgba(0, 0, 0, 0.87);
-
-            #container {
-              margin: 16px;
-            }
-
-            image,
-            label {
-              color: rgb(255, 255, 255);
-
-              &:disabled {
-                opacity: 1;
-                color: rgb(84, 84, 84);
-              }
-            }
-
-            progressbar {
-              min-height: 6px;
-              border-radius: 999px;
-              background: transparent;
-              border: none;
-
-              trough, progress {
-                min-height: inherit;
-                border-radius: inherit;
-                border: none;
-              }
-
-              trough {
-                background: rgb(127, 127, 127);
-              }
-              progress {
-                background: rgb(255, 255, 255);
-              }
-
-              &:disabled {
-                opacity: 1;
-
-                trough {
-                  background: rgb(19, 19, 19);
-                }
-                progress {
-                  background: rgb(38, 38, 38);
-                }
-              }
-            }
-          }
-        '';
-        buildInputs = with pkgs; [sass];
-      } "scss -C --sourcemap=none --style=compact $srcPath $out";
-    };
-  };
-}
diff --git a/accounts/gkleen@sif/niri/waybar.nix b/accounts/gkleen@sif/niri/waybar.nix
deleted file mode 100644
index c02a9a76..00000000
--- a/accounts/gkleen@sif/niri/waybar.nix
+++ /dev/null
@@ -1,358 +0,0 @@
-{ lib, config, pkgs, ... }:
-let
-  swayosd-client = lib.getExe' config.services.swayosd.package "swayosd-client";
-in {
-  config = {
-    programs.waybar = {
-      enable = true;
-      systemd = {
-        enable = true;
-        target = "graphical-session.target";
-      };
-      settings = let
-        windowRewrites = {
-          "(.*) — Mozilla Firefox" = "$1";
-          "(.*) - Mozilla Thunderbird" = "$1";
-          "(.*) - mpv" = "$1";
-        };
-        iconSize = 11;
-      in [
-        {
-          layer = "top";
-          position = "top";
-          height = 21;
-          output = [ "eDP-1" "DP-2" "DP-3" ];
-          modules-left = [ "niri/workspaces" ];
-          modules-center = [ "niri/window" ];
-          modules-right = [ "custom/worktime" "custom/worktime-today"
-            "custom/weather"
-            "custom/keymap"
-            "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "custom/mako" "custom/lid_inhibitor" "clock" ];
-
-          "custom/lid_inhibitor" = {
-            format = "{}";
-            return-type = "json";
-            exec = lib.getExe pkgs.waybar-systemd-inhibit;
-            on-click = lib.getExe' pkgs.waybar-systemd-inhibit "waybar-systemd-inhibit-toggle";
-          };
-          "custom/mako" = {
-            format = "{}";
-            return-type = "json";
-            exec = pkgs.writers.writePython3 "mako-silent" { libraries = [ pkgs.python3Packages.dbus-next ]; } ''
-              from dbus_next.aio import MessageBus
-
-              import asyncio
-
-              import json
-
-
-              loop = asyncio.new_event_loop()
-              asyncio.set_event_loop(loop)
-
-
-              async def main():
-                  bus = await MessageBus().connect()
-                  # the introspection xml would normally be included in your project, but
-                  # this is convenient for development
-                  introspection = await bus.introspect('org.freedesktop.Notifications', '/fr/emersion/Mako')  # noqa: E501
-
-                  obj = bus.get_proxy_object('org.freedesktop.Notifications', '/fr/emersion/Mako', introspection)  # noqa: E501
-                  mako = obj.get_interface('fr.emersion.Mako')
-                  properties = obj.get_interface('org.freedesktop.DBus.Properties')
-
-                  async def print_mode():
-                      modes = await mako.get_modes()
-                      is_silent = "silent" in modes
-                      icon = "󰂛" if is_silent else "󰂚"
-                      text = f"<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>"  # noqa: E501
-                      if is_silent:
-                          text = f"<span color=\"#ffffff\">{text}</span>"
-                      print(json.dumps({'text': text, 'tooltip': ', '.join(modes)}, separators=(',', ':')), flush=True)  # noqa: E501
-
-                  async def on_properties_changed(interface_name, changed_properties, invalidated_properties):  # noqa: E501
-                      if "Modes" not in invalidated_properties:
-                          return
-
-                      await print_mode()
-
-                  properties.on_properties_changed(on_properties_changed)
-                  await print_mode()
-
-                  await loop.create_future()
-
-
-              loop.run_until_complete(main())
-            '';
-            on-click = "makoctl mode -t silent";
-          };
-          "custom/weather" = {
-            format = "{}";
-            tooltip = true;
-            interval = 3600;
-            exec = "${lib.getExe pkgs.wttrbar} --hide-conditions --nerd --custom-indicator \"<span font=\\\"Symbols Nerd Font Mono\\\" size=\\\"100%\\\">{ICON}</span> {FeelsLikeC}°\"";
-            return-type = "json";
-          };
-          "custom/keymap" = {
-            format = "{}";
-            tooltip = true;
-            return-type = "json";
-            exec = pkgs.writers.writePython3 "keymap" {} ''
-              import os
-              import socket
-              import json
-
-
-              def output(keymap):
-                  short = keymap
-                  if keymap == "English (programmer Dvorak)":
-                      short = "dvp"
-                  elif keymap == "English (US)":
-                      short = "<span color=\"#ffffff\">us</span>"
-                  print(json.dumps({'text': short, 'tooltip': keymap}, separators=(',', ':')), flush=True)  # noqa: E501
-
-
-              keyboard_layouts = []
-
-              sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-              sock.connect(os.environ["NIRI_SOCKET"])
-              sock.send(b"\"EventStream\"\n")
-              for line in sock.makefile(buffering=1, encoding='utf-8'):
-                  if line_json := json.loads(line):
-                      if "KeyboardLayoutsChanged" in line_json:
-                          keyboard_layouts = line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["names"]  # noqa: E501
-                          output(keyboard_layouts[line_json["KeyboardLayoutsChanged"]["keyboard_layouts"]["current_idx"]])  # noqa: E501
-                      if "KeyboardLayoutSwitched" in line_json:
-                          output(keyboard_layouts[line_json["KeyboardLayoutSwitched"]["idx"]])  # noqa: E501
-            '';
-            on-click = "niri msg action switch-layout next";
-          };
-          "custom/worktime" = {
-            interval = 60;
-            exec = "${lib.getExe pkgs.worktime} time --waybar";
-            return-type = "json";
-          };
-          "custom/worktime-today" = {
-            interval = 60;
-            exec = "${lib.getExe pkgs.worktime} today --waybar";
-            return-type = "json";
-          };
-          "niri/workspaces" = {
-            ignore = map ({ name, ... }: name) config.programs.niri.scratchspaces;
-          };
-          "niri/window" = {
-            separate-outputs = true;
-            icon = true;
-            icon-size = 14;
-            rewrite = windowRewrites;
-          };
-          clock = {
-              interval = 1;
-              # timezone = "Europe/Berlin";
-              format = "W{:%V-%u %F %H:%M:%S%Ez}";
-              tooltip-format = "<tt><small>{calendar}</small></tt>";
-              calendar = {
-                mode = "year";
-                mode-mon-col = 3;
-                weeks-pos = "left";
-                on-scroll = 1;
-                format = {
-                  months = "<span color='#ffead3'><b>{}</b></span>";
-                  days = "{}";
-                  weeks = "<span color='#99ffdd'><b>{}</b></span>";
-                  weekdays = "<span color='#ffcc66'><b>{}</b></span>";
-                  today = "<span color='#ff6699'><b>{}</b></span>";
-                };
-              };
-          };
-          battery = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize - 2;
-            states = { warning = 30; critical = 15; };
-            format-icons = ["&#xf008e;" "&#xf007a;" "&#xf007b;" "&#xf007c;" "&#xf007d;" "&#xf007e;" "&#xf007f;" "&#xf0080;" "&#xf0081;" "&#xf0082;" "&#xf0079;" ];
-            format-charging = "&#xf0084;";
-            format-plugged = "&#xf06a5;";
-            tooltip-format = "{capacity}% {timeTo}";
-            interval = 20;
-          };
-          tray = {
-            icon-size = 16;
-            # show-passive-items = true;
-            spacing = 1;
-          };
-          privacy = {
-            icon-spacing = 7;
-            icon-size = iconSize;
-            modules = [
-              { type = "screenshare"; }
-              { type = "audio-in"; }
-            ];
-          };
-          idle_inhibitor = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize;
-            format-icons = { activated = "&#xf0208;"; deactivated = "&#xf0209;"; };
-            timeout = 120;
-          };
-          backlight = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize;
-            tooltip-format = "{percent}%";
-            format-icons = ["&#xf00da;" "&#xf00db;" "&#xf00dc;" "&#xf00dd;" "&#xf00de;" "&#xf00df;" "&#xf00e0;"];
-            on-scroll-up = "${swayosd-client} --brightness raise";
-            on-scroll-down = "${swayosd-client} --brightness lower";
-          };
-          wireplumber = {
-            format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
-            icon-size = iconSize;
-            tooltip-format = "{volume}% {node_name}";
-            format-icons = ["&#xf057f;" "&#xf0580;" "&#xf057e;"];
-            format-muted = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">&#xf075f;</span>";
-            # ignored-sinks = ["Easy Effects Sink"];
-            on-scroll-up = "${swayosd-client} --output-volume raise";
-            on-scroll-down = "${swayosd-client} --output-volume lower";
-            on-click = "${swayosd-client} --output-volume mute-toggle";
-          };
-        }
-        {
-          layer = "top";
-          position = "top";
-          height = 14;
-          output = [ "!eDP-1" "!DP-2" "!DP-3" "*" ];
-          modules-left = [ "niri/workspaces" ];
-          modules-center = [ "niri/window" ];
-          modules-right = [ "clock" ];
-
-          "niri/workspaces" = {
-            ignore = map ({ name, ... }: name) config.programs.niri.scratchspaces;
-          };
-          "niri/window" = {
-            separate-outputs = true;
-            icon = true;
-            icon-size = 14;
-            rewrite = windowRewrites;
-          };
-          clock = {
-              interval = 1;
-              # timezone = "Europe/Berlin";
-              format = "{:%H:%M}";
-              tooltip-format = "W{:%V-%u %F %H:%M:%S%Ez}";
-          };
-        }
-      ];
-      style = ''
-        @define-color white #ffffff;
-        @define-color grey #555555;
-        @define-color blue #1a8fff;
-        @define-color green #23fd00;
-        @define-color orange #f28a21;
-        @define-color red #f2201f;
-
-        * {
-          border: none;
-          font-family: "Fira Sans";
-          font-size: 10pt;
-          min-height: 0;
-        }
-
-        window#waybar {
-          background-color: rgba(0, 0, 0, 0.66);
-          color: @white;
-        }
-
-        .modules-left {
-          margin-left: 38px;
-        }
-        .modules-right {
-          margin-right: 38px;
-        }
-
-        .module {
-          margin: 0 5px;
-        }
-
-        #workspaces button {
-          color: @white;
-          padding: 2px 5px;
-        }
-        #workspaces button.empty {
-          color: @grey;
-        }
-        #workspaces button.active {
-          color: @green;
-        }
-        #workspaces button.urgent {
-          color: @red;
-        }
-
-        #custom-weather, #custom-keymap, #custom-worktime, #custom-worktime-today {
-          color: @grey;
-          margin: 0 5px;
-        }
-        #custom-weather {
-          margin-right: 3px;
-        }
-        #custom-keymap {
-          margin-left: 3px;
-          margin-right: 3px;
-        }
-
-        #tray {
-          margin: 0;
-        }
-        #battery, #idle_inhibitor, #backlight, #wireplumber, #custom-mako, #custom-lid_inhibitor {
-          color: @grey;
-          margin: 0 5px 0 2px;
-        }
-        #idle_inhibitor {
-          margin-right: 4px;
-          margin-left: 6px;
-        }
-        #custom-mako {
-          margin-right: 4px;
-          margin-left: 3px;
-        }
-        #custom-lid_inhibitor {
-          margin-right: 3px;
-          margin-left: 3px;
-        }
-        #battery {
-          margin-right: 3px;
-        }
-        #battery.discharging {
-          color: @white;
-        }
-        #battery.warning {
-          color: @orange;
-        }
-        #battery.critical {
-          color: @red;
-        }
-        #battery.charging {
-          color: @white;
-        }
-        #idle_inhibitor.activated {
-          color: @white;
-        }
-        #custom-worktime.running, #custom-worktime-today.running {
-          color: @white;
-        }
-        #custom-worktime.over, #custom-worktime-today.over {
-          color: @orange;
-        }
-
-        #idle_inhibitor, #custom-lid_inhibitor {
-          padding-top: 1px;
-        }
-
-        #privacy {
-          color: @red;
-          margin: -1px 4px 0px 3px;
-        }
-        #clock {
-          /* margin-right: 5px; */
-          font-feature-settings: "tnum";
-        }
-      '';
-    };
-  };
-}