mirror of
https://github.com/nix-community/home-manager.git
synced 2025-12-03 15:41:02 +01:00
dunst: various improvements
This commit is contained in:
Robert Helgesson
commit
b7112b12ea
6 changed files with 214 additions and 96 deletions
|
|
@ -111,9 +111,9 @@ in
|
||||||
example = literalExpression ''
|
example = literalExpression ''
|
||||||
{
|
{
|
||||||
global = {
|
global = {
|
||||||
width = 300;
|
width = "(200,300)";
|
||||||
height = 300;
|
height = "(0,150)";
|
||||||
offset = "30x50";
|
offset = "(30,50)";
|
||||||
origin = "top-right";
|
origin = "top-right";
|
||||||
transparency = 10;
|
transparency = 10;
|
||||||
frame_color = "#eceff1";
|
frame_color = "#eceff1";
|
||||||
|
|
@ -131,102 +131,97 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable (
|
config = lib.mkIf cfg.enable {
|
||||||
lib.mkMerge [
|
assertions = [
|
||||||
{
|
(lib.hm.assertions.assertPlatform "services.dunst" pkgs lib.platforms.linux)
|
||||||
assertions = [
|
];
|
||||||
(lib.hm.assertions.assertPlatform "services.dunst" pkgs lib.platforms.linux)
|
|
||||||
|
home.packages = [ cfg.package ];
|
||||||
|
|
||||||
|
xdg.dataFile."dbus-1/services/org.knopwob.dunst.service".source =
|
||||||
|
"${cfg.package}/share/dbus-1/services/org.knopwob.dunst.service";
|
||||||
|
|
||||||
|
xdg.configFile."dunst/dunstrc" = lib.mkIf (cfg.settings != { }) {
|
||||||
|
text = toDunstIni cfg.settings;
|
||||||
|
};
|
||||||
|
|
||||||
|
services.dunst.settings.global.icon_path =
|
||||||
|
let
|
||||||
|
useCustomTheme =
|
||||||
|
cfg.iconTheme.package != hicolorTheme.package
|
||||||
|
|| cfg.iconTheme.name != hicolorTheme.name
|
||||||
|
|| cfg.iconTheme.size != hicolorTheme.size;
|
||||||
|
|
||||||
|
basePaths = [
|
||||||
|
"/run/current-system/sw"
|
||||||
|
config.home.profileDirectory
|
||||||
|
cfg.iconTheme.package
|
||||||
|
]
|
||||||
|
++ optional useCustomTheme hicolorTheme.package;
|
||||||
|
|
||||||
|
themes = [
|
||||||
|
cfg.iconTheme
|
||||||
|
]
|
||||||
|
++ optional useCustomTheme (hicolorTheme // { size = cfg.iconTheme.size; });
|
||||||
|
|
||||||
|
categories = [
|
||||||
|
"actions"
|
||||||
|
"animations"
|
||||||
|
"apps"
|
||||||
|
"categories"
|
||||||
|
"devices"
|
||||||
|
"emblems"
|
||||||
|
"emotes"
|
||||||
|
"filesystem"
|
||||||
|
"intl"
|
||||||
|
"legacy"
|
||||||
|
"mimetypes"
|
||||||
|
"places"
|
||||||
|
"status"
|
||||||
|
"stock"
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = [ cfg.package ];
|
mkPath =
|
||||||
|
{
|
||||||
|
basePath,
|
||||||
|
theme,
|
||||||
|
category,
|
||||||
|
}:
|
||||||
|
"${basePath}/share/icons/${theme.name}/${theme.size}/${category}";
|
||||||
|
in
|
||||||
|
lib.concatMapStringsSep ":" mkPath (
|
||||||
|
lib.cartesianProduct {
|
||||||
|
basePath = basePaths;
|
||||||
|
theme = themes;
|
||||||
|
category = categories;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
xdg.dataFile."dbus-1/services/org.knopwob.dunst.service".source =
|
systemd.user.services.dunst = {
|
||||||
"${pkgs.dunst}/share/dbus-1/services/org.knopwob.dunst.service";
|
Unit = {
|
||||||
|
Description = "Dunst notification daemon";
|
||||||
|
After = [ config.wayland.systemd.target ];
|
||||||
|
PartOf = [ config.wayland.systemd.target ];
|
||||||
|
X-Reload-Triggers = lib.mkIf (cfg.settings != { }) [
|
||||||
|
"${config.xdg.configFile."dunst/dunstrc".source}"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
services.dunst.settings.global.icon_path =
|
Service = {
|
||||||
let
|
Type = "dbus";
|
||||||
useCustomTheme =
|
BusName = "org.freedesktop.Notifications";
|
||||||
cfg.iconTheme.package != hicolorTheme.package
|
ExecStart = lib.escapeShellArgs (
|
||||||
|| cfg.iconTheme.name != hicolorTheme.name
|
[ "${cfg.package}/bin/dunst" ]
|
||||||
|| cfg.iconTheme.size != hicolorTheme.size;
|
++
|
||||||
|
# Using `-config` breaks dunst's drop-ins, so only use it when an alternative path is set
|
||||||
basePaths = [
|
lib.optionals (cfg.configFile != null) [
|
||||||
"/run/current-system/sw"
|
"-config"
|
||||||
config.home.profileDirectory
|
cfg.configFile
|
||||||
cfg.iconTheme.package
|
|
||||||
]
|
]
|
||||||
++ optional useCustomTheme hicolorTheme.package;
|
);
|
||||||
|
ExecReload = "${cfg.package}/bin/dunstctl reload";
|
||||||
themes = [
|
Environment = lib.optionalString (cfg.waylandDisplay != "") "WAYLAND_DISPLAY=${cfg.waylandDisplay}";
|
||||||
cfg.iconTheme
|
};
|
||||||
]
|
};
|
||||||
++ optional useCustomTheme (hicolorTheme // { size = cfg.iconTheme.size; });
|
};
|
||||||
|
|
||||||
categories = [
|
|
||||||
"actions"
|
|
||||||
"animations"
|
|
||||||
"apps"
|
|
||||||
"categories"
|
|
||||||
"devices"
|
|
||||||
"emblems"
|
|
||||||
"emotes"
|
|
||||||
"filesystem"
|
|
||||||
"intl"
|
|
||||||
"legacy"
|
|
||||||
"mimetypes"
|
|
||||||
"places"
|
|
||||||
"status"
|
|
||||||
"stock"
|
|
||||||
];
|
|
||||||
|
|
||||||
mkPath =
|
|
||||||
{
|
|
||||||
basePath,
|
|
||||||
theme,
|
|
||||||
category,
|
|
||||||
}:
|
|
||||||
"${basePath}/share/icons/${theme.name}/${theme.size}/${category}";
|
|
||||||
in
|
|
||||||
lib.concatMapStringsSep ":" mkPath (
|
|
||||||
lib.cartesianProduct {
|
|
||||||
basePath = basePaths;
|
|
||||||
theme = themes;
|
|
||||||
category = categories;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
systemd.user.services.dunst = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Dunst notification daemon";
|
|
||||||
After = [ config.wayland.systemd.target ];
|
|
||||||
PartOf = [ config.wayland.systemd.target ];
|
|
||||||
};
|
|
||||||
|
|
||||||
Service = {
|
|
||||||
Type = "dbus";
|
|
||||||
BusName = "org.freedesktop.Notifications";
|
|
||||||
ExecStart = lib.escapeShellArgs (
|
|
||||||
[ "${cfg.package}/bin/dunst" ]
|
|
||||||
++
|
|
||||||
# Using `-config` breaks dunst's drop-ins, so only use it when an alternative path is set
|
|
||||||
lib.optionals (cfg.configFile != null) [
|
|
||||||
"-config"
|
|
||||||
cfg.configFile
|
|
||||||
]
|
|
||||||
);
|
|
||||||
Environment = lib.optionalString (cfg.waylandDisplay != "") "WAYLAND_DISPLAY=${cfg.waylandDisplay}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
(lib.mkIf (cfg.settings != { }) {
|
|
||||||
xdg.configFile."dunst/dunstrc" = {
|
|
||||||
text = toDunstIni cfg.settings;
|
|
||||||
onChange = ''
|
|
||||||
${pkgs.procps}/bin/pkill -u "$USER" ''${VERBOSE+-e} dunst || true
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
})
|
|
||||||
]
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
6
tests/modules/services/dunst/default.nix
Normal file
6
tests/modules/services/dunst/default.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
|
lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
|
||||||
|
dunst-with-settings = ./with-settings.nix;
|
||||||
|
dunst-without-settings = ./without-settings.nix;
|
||||||
|
}
|
||||||
14
tests/modules/services/dunst/with-settings-expected.ini
Normal file
14
tests/modules/services/dunst/with-settings-expected.ini
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
[global]
|
||||||
|
font="Droid Sans 9"
|
||||||
|
frame_color="#eceff1"
|
||||||
|
height="(0,150)"
|
||||||
|
icon_path="/run/current-system/sw/share/icons/hicolor/32x32/actions:/run/current-system/sw/share/icons/hicolor/32x32/animations:/run/current-system/sw/share/icons/hicolor/32x32/apps:/run/current-system/sw/share/icons/hicolor/32x32/categories:/run/current-system/sw/share/icons/hicolor/32x32/devices:/run/current-system/sw/share/icons/hicolor/32x32/emblems:/run/current-system/sw/share/icons/hicolor/32x32/emotes:/run/current-system/sw/share/icons/hicolor/32x32/filesystem:/run/current-system/sw/share/icons/hicolor/32x32/intl:/run/current-system/sw/share/icons/hicolor/32x32/legacy:/run/current-system/sw/share/icons/hicolor/32x32/mimetypes:/run/current-system/sw/share/icons/hicolor/32x32/places:/run/current-system/sw/share/icons/hicolor/32x32/status:/run/current-system/sw/share/icons/hicolor/32x32/stock:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/actions:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/animations:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/apps:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/categories:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/devices:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/emblems:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/emotes:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/filesystem:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/intl:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/legacy:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/mimetypes:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/places:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/status:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/stock:@hicolor-icon-theme@/share/icons/hicolor/32x32/actions:@hicolor-icon-theme@/share/icons/hicolor/32x32/animations:@hicolor-icon-theme@/share/icons/hicolor/32x32/apps:@hicolor-icon-theme@/share/icons/hicolor/32x32/categories:@hicolor-icon-theme@/share/icons/hicolor/32x32/devices:@hicolor-icon-theme@/share/icons/hicolor/32x32/emblems:@hicolor-icon-theme@/share/icons/hicolor/32x32/emotes:@hicolor-icon-theme@/share/icons/hicolor/32x32/filesystem:@hicolor-icon-theme@/share/icons/hicolor/32x32/intl:@hicolor-icon-theme@/share/icons/hicolor/32x32/legacy:@hicolor-icon-theme@/share/icons/hicolor/32x32/mimetypes:@hicolor-icon-theme@/share/icons/hicolor/32x32/places:@hicolor-icon-theme@/share/icons/hicolor/32x32/status:@hicolor-icon-theme@/share/icons/hicolor/32x32/stock"
|
||||||
|
offset="(30,50)"
|
||||||
|
origin="top-right"
|
||||||
|
transparency=10
|
||||||
|
width="(200,300)"
|
||||||
|
|
||||||
|
[urgency_normal]
|
||||||
|
background="#37474f"
|
||||||
|
foreground="#eceff1"
|
||||||
|
timeout=10
|
||||||
59
tests/modules/services/dunst/with-settings.nix
Normal file
59
tests/modules/services/dunst/with-settings.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
||||||
|
{ config, ... }:
|
||||||
|
let
|
||||||
|
inherit (config.lib.test) mkStubPackage;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.dunst = {
|
||||||
|
enable = true;
|
||||||
|
package = mkStubPackage {
|
||||||
|
name = "dunst";
|
||||||
|
buildScript = ''
|
||||||
|
mkdir -p $out/share/dbus-1/services
|
||||||
|
echo test > $out/share/dbus-1/services/org.knopwob.dunst.service
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
settings = {
|
||||||
|
global = {
|
||||||
|
width = "(200,300)";
|
||||||
|
height = "(0,150)";
|
||||||
|
offset = "(30,50)";
|
||||||
|
origin = "top-right";
|
||||||
|
transparency = 10;
|
||||||
|
frame_color = "#eceff1";
|
||||||
|
font = "Droid Sans 9";
|
||||||
|
};
|
||||||
|
|
||||||
|
urgency_normal = {
|
||||||
|
background = "#37474f";
|
||||||
|
foreground = "#eceff1";
|
||||||
|
timeout = 10;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nmt.script = ''
|
||||||
|
configFile=home-files/.config/dunst/dunstrc
|
||||||
|
serviceFile=home-files/.config/systemd/user/dunst.service
|
||||||
|
|
||||||
|
assertFileExists $configFile
|
||||||
|
assertFileContent $configFile ${./with-settings-expected.ini}
|
||||||
|
|
||||||
|
assertFileExists $serviceFile
|
||||||
|
assertFileContent \
|
||||||
|
$(normalizeStorePaths $serviceFile) \
|
||||||
|
${builtins.toFile "expected.service" ''
|
||||||
|
[Service]
|
||||||
|
BusName=org.freedesktop.Notifications
|
||||||
|
Environment=
|
||||||
|
ExecReload=/nix/store/00000000000000000000000000000000-dunst/bin/dunstctl reload
|
||||||
|
ExecStart=/nix/store/00000000000000000000000000000000-dunst/bin/dunst
|
||||||
|
Type=dbus
|
||||||
|
|
||||||
|
[Unit]
|
||||||
|
After=graphical-session.target
|
||||||
|
Description=Dunst notification daemon
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
X-Reload-Triggers=/nix/store/00000000000000000000000000000000-hm_dunstdunstrc
|
||||||
|
''}
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
[global]
|
||||||
|
icon_path="/run/current-system/sw/share/icons/hicolor/32x32/actions:/run/current-system/sw/share/icons/hicolor/32x32/animations:/run/current-system/sw/share/icons/hicolor/32x32/apps:/run/current-system/sw/share/icons/hicolor/32x32/categories:/run/current-system/sw/share/icons/hicolor/32x32/devices:/run/current-system/sw/share/icons/hicolor/32x32/emblems:/run/current-system/sw/share/icons/hicolor/32x32/emotes:/run/current-system/sw/share/icons/hicolor/32x32/filesystem:/run/current-system/sw/share/icons/hicolor/32x32/intl:/run/current-system/sw/share/icons/hicolor/32x32/legacy:/run/current-system/sw/share/icons/hicolor/32x32/mimetypes:/run/current-system/sw/share/icons/hicolor/32x32/places:/run/current-system/sw/share/icons/hicolor/32x32/status:/run/current-system/sw/share/icons/hicolor/32x32/stock:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/actions:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/animations:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/apps:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/categories:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/devices:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/emblems:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/emotes:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/filesystem:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/intl:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/legacy:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/mimetypes:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/places:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/status:/home/hm-user/.nix-profile/share/icons/hicolor/32x32/stock:@hicolor-icon-theme@/share/icons/hicolor/32x32/actions:@hicolor-icon-theme@/share/icons/hicolor/32x32/animations:@hicolor-icon-theme@/share/icons/hicolor/32x32/apps:@hicolor-icon-theme@/share/icons/hicolor/32x32/categories:@hicolor-icon-theme@/share/icons/hicolor/32x32/devices:@hicolor-icon-theme@/share/icons/hicolor/32x32/emblems:@hicolor-icon-theme@/share/icons/hicolor/32x32/emotes:@hicolor-icon-theme@/share/icons/hicolor/32x32/filesystem:@hicolor-icon-theme@/share/icons/hicolor/32x32/intl:@hicolor-icon-theme@/share/icons/hicolor/32x32/legacy:@hicolor-icon-theme@/share/icons/hicolor/32x32/mimetypes:@hicolor-icon-theme@/share/icons/hicolor/32x32/places:@hicolor-icon-theme@/share/icons/hicolor/32x32/status:@hicolor-icon-theme@/share/icons/hicolor/32x32/stock"
|
||||||
42
tests/modules/services/dunst/without-settings.nix
Normal file
42
tests/modules/services/dunst/without-settings.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
||||||
|
{ config, ... }:
|
||||||
|
let
|
||||||
|
inherit (config.lib.test) mkStubPackage;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.dunst = {
|
||||||
|
enable = true;
|
||||||
|
package = mkStubPackage {
|
||||||
|
name = "dunst";
|
||||||
|
buildScript = ''
|
||||||
|
mkdir -p $out/share/dbus-1/services
|
||||||
|
echo test > $out/share/dbus-1/services/org.knopwob.dunst.service
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nmt.script = ''
|
||||||
|
configFile=home-files/.config/dunst/dunstrc
|
||||||
|
serviceFile=home-files/.config/systemd/user/dunst.service
|
||||||
|
|
||||||
|
assertFileExists $configFile
|
||||||
|
assertFileContent $configFile ${./without-settings-expected.ini}
|
||||||
|
|
||||||
|
assertFileExists $serviceFile
|
||||||
|
assertFileContent \
|
||||||
|
$(normalizeStorePaths $serviceFile) \
|
||||||
|
${builtins.toFile "expected.service" ''
|
||||||
|
[Service]
|
||||||
|
BusName=org.freedesktop.Notifications
|
||||||
|
Environment=
|
||||||
|
ExecReload=/nix/store/00000000000000000000000000000000-dunst/bin/dunstctl reload
|
||||||
|
ExecStart=/nix/store/00000000000000000000000000000000-dunst/bin/dunst
|
||||||
|
Type=dbus
|
||||||
|
|
||||||
|
[Unit]
|
||||||
|
After=graphical-session.target
|
||||||
|
Description=Dunst notification daemon
|
||||||
|
PartOf=graphical-session.target
|
||||||
|
X-Reload-Triggers=/nix/store/00000000000000000000000000000000-hm_dunstdunstrc
|
||||||
|
''}
|
||||||
|
'';
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue