mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
feat(vdirsyncer): fix birthday calendar issue, add fysi
This commit is contained in:
@@ -1,9 +1,16 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
davHome = "~/.local/share/dav";
|
davHome = "~/.local/share/dav";
|
||||||
davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
|
kmeinCloud = {
|
||||||
username = "kieran";
|
davEndpoint = "https://cloud.xn--kiern-0qa.de/remote.php/dav";
|
||||||
password = lib.fileContents <secrets/nextcloud/password>;
|
username = "kieran";
|
||||||
|
password = lib.fileContents <secrets/nextcloud/password>;
|
||||||
|
};
|
||||||
|
fysiCloud = {
|
||||||
|
davEndpoint = "https://nextcloud.fysi.dev/remote.php/dav";
|
||||||
|
username = "kmein";
|
||||||
|
password = lib.fileContents <secrets/nextcloud-fysi/password>;
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
environment.systemPackages = [ pkgs.khal pkgs.vdirsyncer pkgs.khard pkgs.todoman ];
|
environment.systemPackages = [ pkgs.khal pkgs.vdirsyncer pkgs.khard pkgs.todoman ];
|
||||||
@@ -65,9 +72,30 @@ in
|
|||||||
"khal/config".text = ''
|
"khal/config".text = ''
|
||||||
[calendars]
|
[calendars]
|
||||||
|
|
||||||
[[kalender_local]]
|
[[alew]]
|
||||||
path = ${davHome}/calendar/*
|
path = ${davHome}/calendar/alew
|
||||||
type = discover
|
color = "light gray"
|
||||||
|
|
||||||
|
[[personal]]
|
||||||
|
path = ${davHome}/calendar/personal
|
||||||
|
color = "light cyan"
|
||||||
|
|
||||||
|
[[uni]]
|
||||||
|
path = ${davHome}/calendar/uni-1
|
||||||
|
color = "yellow"
|
||||||
|
|
||||||
|
[[fysi]]
|
||||||
|
path = ${davHome}/calendar/fysi-1
|
||||||
|
color = "light magenta"
|
||||||
|
|
||||||
|
[[fysi_team]]
|
||||||
|
path = ${davHome}/calendar/personal_shared_by_fdf
|
||||||
|
color = "light red"
|
||||||
|
|
||||||
|
[[birthdays]]
|
||||||
|
path = ${davHome}/contacts/contacts
|
||||||
|
type = birthdays
|
||||||
|
color = "light green"
|
||||||
|
|
||||||
[default]
|
[default]
|
||||||
highlight_event_days = True
|
highlight_event_days = True
|
||||||
@@ -97,7 +125,13 @@ in
|
|||||||
[pair kalender]
|
[pair kalender]
|
||||||
a = "kalender_local"
|
a = "kalender_local"
|
||||||
b = "kalender_cloud"
|
b = "kalender_cloud"
|
||||||
collections = ["from a", "from b"]
|
collections = ["personal", "alew", "uni-1"]
|
||||||
|
conflict_resolution = "b wins"
|
||||||
|
|
||||||
|
[pair fysi]
|
||||||
|
a = "kalender_local"
|
||||||
|
b = "fysi_cloud"
|
||||||
|
collections = ["fysi-1", "personal_shared_by_fdf"]
|
||||||
conflict_resolution = "b wins"
|
conflict_resolution = "b wins"
|
||||||
|
|
||||||
[storage kontakte_local]
|
[storage kontakte_local]
|
||||||
@@ -112,15 +146,21 @@ in
|
|||||||
|
|
||||||
[storage kontakte_cloud]
|
[storage kontakte_cloud]
|
||||||
type = "carddav"
|
type = "carddav"
|
||||||
url = "${davEndpoint}/addressbooks/users/${username}/"
|
url = "${kmeinCloud.davEndpoint}/addressbooks/users/${kmeinCloud.username}/"
|
||||||
username = "${username}"
|
username = "${kmeinCloud.username}"
|
||||||
password = "${password}"
|
password = "${kmeinCloud.password}"
|
||||||
|
|
||||||
[storage kalender_cloud]
|
[storage kalender_cloud]
|
||||||
type = "caldav"
|
type = "caldav"
|
||||||
url = "${davEndpoint}/calendars/${username}/"
|
url = "${kmeinCloud.davEndpoint}/calendars/${kmeinCloud.username}/"
|
||||||
username = "${username}"
|
username = "${kmeinCloud.username}"
|
||||||
password = "${password}"
|
password = "${kmeinCloud.password}"
|
||||||
|
|
||||||
|
[storage fysi_cloud]
|
||||||
|
type = "caldav"
|
||||||
|
url = "${fysiCloud.davEndpoint}/calendars/${fysiCloud.username}/"
|
||||||
|
username = "${fysiCloud.username}"
|
||||||
|
password = "${fysiCloud.password}"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user