mako: disable the dbus service so our systemd service can take control
This commit is contained in:
@@ -3,6 +3,12 @@
|
|||||||
{ lib, config, pkgs, ... }:
|
{ lib, config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
sane.programs.mako = {
|
sane.programs.mako = {
|
||||||
|
package = pkgs.mako.overrideAttrs (upstream: {
|
||||||
|
postInstall = (upstream.postInstall or "") + ''
|
||||||
|
# we control mako as a systemd service, so have dbus not automatically activate it.
|
||||||
|
rm $out/share/dbus-1/services/fr.emersion.mako.service
|
||||||
|
'';
|
||||||
|
});
|
||||||
fs.".config/mako/config".symlink.text = ''
|
fs.".config/mako/config".symlink.text = ''
|
||||||
# notification interaction mapping
|
# notification interaction mapping
|
||||||
# "on-touch" defaults to "dismiss", which isn't nice for touchscreens.
|
# "on-touch" defaults to "dismiss", which isn't nice for touchscreens.
|
||||||
@@ -60,10 +66,8 @@
|
|||||||
|
|
||||||
serviceConfig.ExecStart = "${pkgs.mako}/bin/mako";
|
serviceConfig.ExecStart = "${pkgs.mako}/bin/mako";
|
||||||
serviceConfig.Type = "simple";
|
serviceConfig.Type = "simple";
|
||||||
|
# mako will predictably fail if launched before the wayland server is fully initialized
|
||||||
serviceConfig.Restart = "on-failure";
|
serviceConfig.Restart = "on-failure";
|
||||||
serviceConfig.RestartSec = "10s";
|
serviceConfig.RestartSec = "10s";
|
||||||
|
|
||||||
# don't start mako until after sway
|
|
||||||
preStart = ''test -n "$SWAYSOCK"'';
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user