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

This commit is contained in:
Till 2025-05-03 22:14:07 +02:00
commit ccacf44130
4 changed files with 67 additions and 31 deletions

View file

@ -8,13 +8,23 @@ let
url = "https://baikal.ktiu.net/dav.php/calendars/till/${slug}";
};
myRemote = slug: {
passwordCommand = [ "secret-tool" "lookup" "server" "kalender.ktiu.net" "account" "ktiu" ];
userName = "ktiu";
type = "caldav";
url = "https://kalender.ktiu.net/ktiu/${slug}";
};
calDefaults = {
khal.type = "calendar";
local = {
type = "filesystem";
fileExt = ".ics";
};
vdirsyncer.enable = true;
vdirsyncer = {
enable = true;
conflictResolution = "local wins";
};
};
in
@ -49,37 +59,31 @@ in
accounts.calendar.basePath = "${config.xdg.dataHome}/calendars";
accounts.calendar.accounts = {
till = {
till = calDefaults // {
khal.enable = true;
local = {
type = "filesystem";
fileExt = ".ics";
};
vdirsyncer.enable = true;
primary = true;
primaryCollection = "till";
khal.color = "light blue";
remote = baikalRemote "default";
remote = myRemote "personal";
};
mitlisa = calDefaults // {
khal.enable = true;
khal.color = "light magenta";
remote = baikalRemote "867d77c5-088f-4617-aeb8-6c9a18925e30";
remote = myRemote "lisa-und-till";
};
family = calDefaults // {
khal.enable = true;
khal.color = "dark magenta";
remote = baikalRemote "75db196d-bc81-4de3-96dc-d4c068c1234b";
remote = myRemote "family";
};
bdays = calDefaults // {
khal.enable = true;
khal.color = "yellow";
remote = baikalRemote "geburtstage";
remote = myRemote "geburtstage";
};
polit = calDefaults // {
khal.enable = true;
khal.color = "dark gray";
remote = baikalRemote "polit";
remote = myRemote "polit";
};
ihg = calDefaults // {
khal.enable = true;
@ -89,14 +93,6 @@ in
url = "https://geocom.uni-frankfurt.de/radicale/ihg/5012a739-dbaf-334b-f093-8db1860bc26e/";
};
};
"mittelbau" = calDefaults // {
khal.enable = true;
khal.color = "light cyan";
remote = {
type = "http";
url = "https://geocom.uni-frankfurt.de/radicale/ihg/d806b31d-dd3d-9d97-d3e5-f179addeb60a/";
};
};
"eintracht_m" = calDefaults // {
khal.enable = true;
khal.color = "light red";
@ -113,14 +109,6 @@ in
url = "http://i.cal.to/ical/5940/eintrachtfrankfurt/spielplan-frauen-profis/28ae0d30.f781380b-1763bff2.ics";
};
};
"digitell" = calDefaults // {
khal.enable = true;
khal.color = "dark green";
remote = {
type = "http";
url = "https://crowd.server.uni-frankfurt.de/rest/calendar-services/1.0/calendar/export/subcalendar/private/f3087e14d058267065ebbdf43b096cb31517e9ea.ics";
};
};
"grid" = calDefaults // {
khal.enable = true;
khal.color = "light green";

View file

@ -17,6 +17,7 @@
liberation_ttf
libertine
libertinus
merriweather
mona-sans
monaspace
noto-fonts
@ -25,6 +26,7 @@
roboto
rubik
source-sans-pro
source-serif-pro
stix-two
textfonts
tlwg

View file

@ -53,6 +53,7 @@ macro index,pager gj "<change-folder>$my_junk<enter><refresh>" "Go to ju
# accounts
macro index,pager gu "<change-folder>~/.local/share/mail/gu/Inbox<enter><refresh>" "Go to GU"
# macro index,pager gp "<change-folder>+systemli/IMAP/Inbox<enter><refresh>" "Go to Systemli"
macro index,pager gm "<change-folder>~/.local/share/mail/t9e/Inbox<enter><refresh>" "Go to t9e"
# macro index,pager gm "<change-folder>+gmail/IMAP/Inbox<enter><refresh>" "Go to Gmail"
macro index,pager gk "<change-folder>~/.local/share/mail/ksh/Inbox<enter><refresh>" "Go to KSH"
macro index,pager gi "<change-folder>~/.local/share/mail/ktiu/Inbox<enter><refresh>" "Go to ktiu"

View file

@ -42,6 +42,7 @@
showSignature = "append";
};
mbsync.enable = true;
mbsync.create = "maildir";
msmtp.enable = true;
neomutt = {
enable = true;
@ -79,6 +80,49 @@
'';
};
};
t9e = {
address = "till@t9e.me";
realName = "Till Straube";
imap.host = "mail.ktiu.net";
smtp.host = "mail.ktiu.net";
smtp.tls.useStartTls = true;
notmuch.enable = true;
userName = "till";
signature.text = ''
Till Straube (he/him)
'';
signature.showSignature = "append";
neomutt = {
enable = true;
sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
extraConfig = ''
set my_mbsync_acct='t9e'
set mbox='+Archive'
set my_junk='+Junk'
unset crypt_auto_pgp
unset crypt_auto_smime
unalternates *
alternates @t9e.me$
set reverse_name
set my_signature = ${
pkgs.writeText
"signature.txt"
config.accounts.email.accounts.t9e.signature.text
}
color status green default
'';
};
mbsync.enable = true;
mbsync.create = "maildir";
msmtp = {
enable = true;
extraConfig.from = "*@t9e.me";
};
passwordCommand = "secret-tool lookup server mail.ktiu.net account till";
};
ktiu = {
address = "till@ktiu.net";
realName = "Till Straube";
@ -120,6 +164,7 @@
'';
};
mbsync.enable = true;
mbsync.create = "maildir";
msmtp = {
enable = true;
extraConfig.from = "*@ktiu.net";