Rename UKAEA account to Outlook
This commit is contained in:
parent
5eb18b2de0
commit
aae04d3336
|
@ -48,11 +48,11 @@ Register app-password with gnome-keyring:
|
|||
#+begin_src bash
|
||||
secret-tool store --label="iCloud mail mbsync" email e.litherlandsmith@icloud.com
|
||||
#+end_src
|
||||
** UKAEA
|
||||
** Outlook
|
||||
*** Password
|
||||
Register app-password with gnome-keyring:
|
||||
#+begin_src bash
|
||||
secret-tool store --label="UKAEA mail mbsync" email evie.litherland-smith@ukaea.uk
|
||||
secret-tool store --label="Outlook mail mbsync" email evie.litherland-smith@ukaea.uk
|
||||
#+end_src
|
||||
*** Configuration
|
||||
On first run (or if token expires), stop systemd service and run manually to complete manual auth. Token will stay valid for a little while (no idea how long specifically).
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
type = "discover";
|
||||
};
|
||||
};
|
||||
ukaea = let emailConfig = config.accounts.email.accounts.ukaea;
|
||||
outlook = let emailConfig = config.accounts.email.accounts.outlook;
|
||||
in rec {
|
||||
inherit local;
|
||||
primary = lib.mkDefault false;
|
||||
|
@ -59,7 +59,7 @@
|
|||
type = "discover";
|
||||
};
|
||||
};
|
||||
outlook = rec {
|
||||
outlook_ro = rec {
|
||||
inherit local;
|
||||
remote = {
|
||||
type = "http";
|
||||
|
|
|
@ -24,20 +24,6 @@
|
|||
collections = [ "from a" ];
|
||||
};
|
||||
};
|
||||
# Remove for now as contact syncing doesn't seem to work with davmail
|
||||
# TODO investigate LDAP based solution instead
|
||||
# ukaea = {
|
||||
# inherit local;
|
||||
# remote = rec {
|
||||
# inherit (calendarAccounts.ukaea.remote) userName passwordCommand;
|
||||
# type = "carddav";
|
||||
# url = "http://localhost:1080/users/${userName}/contacts/";
|
||||
# };
|
||||
# vdirsyncer = {
|
||||
# inherit (calendarAccounts.ukaea.vdirsyncer) enable;
|
||||
# collections = [ "contacts" ];
|
||||
# };
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
groups.inboxes = {
|
||||
proton = [ "INBOX" ];
|
||||
icloud = [ "INBOX" ];
|
||||
ukaea = [ "INBOX" ];
|
||||
outlook = [ "INBOX" ];
|
||||
};
|
||||
};
|
||||
msmtp.enable = true;
|
||||
|
@ -79,7 +79,7 @@
|
|||
icloud = let accountEnabled = true;
|
||||
in rec {
|
||||
inherit realName;
|
||||
primary = lib.mkDefault false; # TEMP until proton is fixed
|
||||
primary = lib.mkDefault false;
|
||||
maildir.path = "iCloud";
|
||||
imap.host = "imap.mail.me.com";
|
||||
smtp.host = "smtp.mail.me.com";
|
||||
|
@ -106,14 +106,14 @@
|
|||
msmtp.enable = lib.mkDefault accountEnabled;
|
||||
mu.enable = lib.mkDefault accountEnabled;
|
||||
};
|
||||
ukaea = let
|
||||
outlook = let
|
||||
host = "127.0.0.1";
|
||||
tls.enable = false;
|
||||
accountEnabled = true;
|
||||
in rec {
|
||||
inherit realName;
|
||||
primary = lib.mkDefault false;
|
||||
maildir.path = "UKAEA";
|
||||
maildir.path = "Outlook";
|
||||
imap = {
|
||||
inherit host tls;
|
||||
port = 1144;
|
||||
|
@ -130,9 +130,9 @@
|
|||
imapnotify = {
|
||||
enable = lib.mkDefault accountEnabled;
|
||||
boxes = [ "INBOX" ];
|
||||
onNotify = "${pkgs.isync}/bin/mbsync ukaea:INBOX";
|
||||
onNotify = "${pkgs.isync}/bin/mbsync outlook:INBOX";
|
||||
onNotifyPost =
|
||||
"${pkgs.libnotify}/bin/notify-send 'UKAEA: Inbox updated'";
|
||||
"${pkgs.libnotify}/bin/notify-send 'Outlook: Inbox updated'";
|
||||
extraConfig = {
|
||||
wait = 300;
|
||||
tls = false;
|
||||
|
@ -166,7 +166,7 @@
|
|||
Wants = [ "protonmail-bridge.service" ];
|
||||
After = [ "protonmail-bridge.service" ];
|
||||
};
|
||||
imapnotify-ukaea.Unit = lib.mkIf emailAccounts.ukaea.imapnotify.enable {
|
||||
imapnotify-outlook.Unit = lib.mkIf emailAccounts.outlook.imapnotify.enable {
|
||||
Wants = [ "davmail.service" ];
|
||||
After = [ "davmail.service" ];
|
||||
};
|
||||
|
@ -209,7 +209,7 @@
|
|||
};
|
||||
Install.WantedBy = [ "default.target" ];
|
||||
};
|
||||
davmail = lib.mkIf emailAccounts.ukaea.mbsync.enable {
|
||||
davmail = lib.mkIf emailAccounts.outlook.mbsync.enable {
|
||||
Unit = {
|
||||
Description = "Davmail server";
|
||||
Wants = [ "network-online.target" ];
|
||||
|
|
|
@ -17,12 +17,18 @@
|
|||
doom-emoji-fallback-font-families '("Noto Color Emoji" "Noto Emoji")
|
||||
nerd-icons-font-family "FiraCode Nerd Font"
|
||||
doom-theme 'doom-tokyo-night
|
||||
doom-modeline-gnus t
|
||||
doom-modeline-persp-icon t
|
||||
doom-modeline-persp-name t
|
||||
display-line-numbers-type 'relative
|
||||
org-directory "~/Notes/"
|
||||
+latex-viewers '(pdf-tools)
|
||||
+format-with-lsp nil)
|
||||
(+global-word-wrap-mode +1)
|
||||
|
||||
(after! gnus
|
||||
(setq gnus-select-method '(nntp "news.gnus.org"))
|
||||
|
||||
;; elfeed RSS sources
|
||||
(after! elfeed
|
||||
(setq elfeed-feeds
|
||||
|
@ -53,7 +59,7 @@
|
|||
message-send-mail-function #'message-send-mail-with-sendmail
|
||||
mu4e-maildir-shortcuts '((:maildir "/Proton/Inbox/" :key ?p)
|
||||
(:maildir "/iCloud/Inbox/" :key ?i)
|
||||
(:maildir "/UKAEA/Inbox/" :key ?u)))
|
||||
(:maildir "/Outlook/Inbox/" :key ?o)))
|
||||
|
||||
(setq mu4e-modeline-all-read '("R:" . " ")
|
||||
mu4e-modeline-all-clear '("C:" . " ")
|
||||
|
@ -80,12 +86,12 @@
|
|||
(mu4e-trash-folder . "/iCloud/Trash")
|
||||
(mu4e-refile-folder . "/iCloud/Archive"))
|
||||
nil)
|
||||
(set-email-account! "UKAEA"
|
||||
(set-email-account! "Outlook"
|
||||
'((user-mail-address . "evie.litherland-smith@ukaea.uk")
|
||||
(mu4e-sent-folder . "/UKAEA/Sent")
|
||||
(mu4e-drafts-folder . "/UKAEA/Drafts")
|
||||
(mu4e-trash-folder . "/UKAEA/Trash")
|
||||
(mu4e-refile-folder . "/UKAEA/Archive"))
|
||||
(mu4e-sent-folder . "/Outlook/Sent")
|
||||
(mu4e-drafts-folder . "/Outlook/Drafts")
|
||||
(mu4e-trash-folder . "/Outlook/Trash")
|
||||
(mu4e-refile-folder . "/Outlook/Archive"))
|
||||
nil)
|
||||
)
|
||||
|
||||
|
@ -98,7 +104,6 @@
|
|||
(cfw:org-create-source "Green") ; org-agenda source
|
||||
(cfw:ical-create-source "Personal" "~/.calendar/nextcloud/personal.ics" "Red")
|
||||
(cfw:ical-create-source "Birthdays" "~/.calendar/nextcloud/contact_birthdays.ics" "Grey")
|
||||
;; (cfw:ical-create-source "UKAEA" "~/.calendar/ukaea/calendar.ics" "Blue")
|
||||
)))
|
||||
|
||||
;; Org-mode settings
|
||||
|
|
|
@ -6,16 +6,15 @@
|
|||
firefox.profiles.default.settings."browser.startup.homepage" =
|
||||
"https://nucleus.ukaea.uk";
|
||||
};
|
||||
programs.mbsync.groups.inboxes.ukaea = [ "INBOX" ];
|
||||
accounts = {
|
||||
email.accounts = {
|
||||
proton.primary = false;
|
||||
ukaea.primary = true;
|
||||
outlook.primary = true;
|
||||
};
|
||||
calendar.accounts = {
|
||||
nextcloud.vdirsyncer.enable = false; # TEMP until fixed
|
||||
nextcloud.primary = false;
|
||||
ukaea.primary = true;
|
||||
outlook.primary = true;
|
||||
};
|
||||
};
|
||||
xdg.configFile."hypr/extra.conf".text = ''
|
||||
|
|
|
@ -6,14 +6,6 @@
|
|||
firefox.profiles.default.settings."browser.startup.homepage" =
|
||||
"https://nucleus.ukaea.uk";
|
||||
};
|
||||
programs.mbsync.groups.inboxes.ukaea = [ "INBOX" ];
|
||||
accounts = {
|
||||
email.accounts = {
|
||||
proton.primary = false;
|
||||
ukaea.primary = true;
|
||||
};
|
||||
calendar.accounts.nextcloud.vdirsyncer.enable = false; # TEMP until fixed
|
||||
};
|
||||
services.vdirsyncer.enable = lib.mkForce false; # TEMP until fixed
|
||||
xdg.configFile."hypr/extra.conf".text = ''
|
||||
misc {
|
||||
|
|
Loading…
Reference in a new issue