Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
Evie Litherland-Smith 2023-10-04 17:31:05 +01:00
commit e60576bcc3

View file

@ -47,7 +47,7 @@
imapnotify = { imapnotify = {
enable = lib.mkDefault accountEnabled; enable = lib.mkDefault accountEnabled;
boxes = [ "INBOX" ]; boxes = [ "INBOX" ];
onNotify = "${pkgs.isync}/bin/mbsync --pull proton:INBOX"; onNotify = "${pkgs.isync}/bin/mbsync --pull-new proton:INBOX";
onNotifyPost = onNotifyPost =
"${pkgs.libnotify}/bin/notify-send 'Proton: New mail arrived'"; "${pkgs.libnotify}/bin/notify-send 'Proton: New mail arrived'";
extraConfig = { extraConfig = {
@ -88,7 +88,7 @@
imapnotify = { imapnotify = {
enable = lib.mkDefault accountEnabled; enable = lib.mkDefault accountEnabled;
boxes = [ "INBOX" ]; boxes = [ "INBOX" ];
onNotify = "${pkgs.isync}/bin/mbsync --pull icloud:INBOX"; onNotify = "${pkgs.isync}/bin/mbsync --pull-new icloud:INBOX";
onNotifyPost = onNotifyPost =
"${pkgs.libnotify}/bin/notify-send 'iCloud: New mail arrived'"; "${pkgs.libnotify}/bin/notify-send 'iCloud: New mail arrived'";
extraConfig.wait = 300; extraConfig.wait = 300;
@ -128,7 +128,7 @@
imapnotify = { imapnotify = {
enable = lib.mkDefault accountEnabled; enable = lib.mkDefault accountEnabled;
boxes = [ "INBOX" ]; boxes = [ "INBOX" ];
onNotify = "${pkgs.isync}/bin/mbsync --pull ukaea:INBOX"; onNotify = "${pkgs.isync}/bin/mbsync --pull-new ukaea:INBOX";
onNotifyPost = onNotifyPost =
"${pkgs.libnotify}/bin/notify-send 'UKAEA: New mail arrived'"; "${pkgs.libnotify}/bin/notify-send 'UKAEA: New mail arrived'";
extraConfig = { extraConfig = {
@ -210,8 +210,8 @@
davmail = lib.mkIf emailAccounts.ukaea.mbsync.enable { davmail = lib.mkIf emailAccounts.ukaea.mbsync.enable {
Unit = { Unit = {
Description = "Davmail server"; Description = "Davmail server";
Wants = [ "network-online.target" "graphical-session.target" ]; Wants = [ "network-online.target" "hyprland-session.target" ];
After = [ "network-online.target" "graphical-session.target" ]; After = [ "network-online.target" "hyprland-session.target" ];
}; };
Service = { Service = {
Environment = [ "PATH=/run/current-system/sw/bin/:$PATH" ]; Environment = [ "PATH=/run/current-system/sw/bin/:$PATH" ];