diff --git a/khal/.config/khal/config b/khal/.config/khal/config
index f2d70af..5975107 100644
--- a/khal/.config/khal/config
+++ b/khal/.config/khal/config
@@ -1,13 +1,18 @@
[calendars]
[[bob_calendar_local]]
-path = ~/.calendars/*
+path = ~/.calendars/radicale/
type = discover
[[bob_contacts_local]]
path = ~/.contacts/*
type = discover
+[[google_calendar_local]]
+path = ~/.calendars/google/amin.kasrou@jitkey.com/
+type = discover
+color = dark green
+
[locale]
timeformat = %H:%M
dateformat = %d/%m/
@@ -18,10 +23,13 @@ local_timezone= Europe/Brussels
default_timezone= Europe/Brussels
[default]
-default_calendar = Misc
-timedelta = 60d
+default_calendar = amin.kasrou@jitkey.com
+timedelta = 7d
highlight_event_days = true
print_new = event
+[view]
+agenda_event_format = {calendar-color}{cancelled}{start-end-time-style} {title}{repeat-symbol}{reset}
+
[highlight_days]
method = fg
diff --git a/openbox/.config/openbox/rc.xml b/openbox/.config/openbox/rc.xml
index da83988..c02da54 100755
--- a/openbox/.config/openbox/rc.xml
+++ b/openbox/.config/openbox/rc.xml
@@ -214,6 +214,16 @@
mpc stop
+
+
+ mpc next
+
+
+
+
+ mpc prev
+
+
xdg-open "$(locate home media | rofi -threads 0 -width 100 -color-window "#000000, #000000, #000000" -color-normal "#000000, #b3e774, #000000, #b3e774, #000000" -color-active "#000000, #b3e774, #000000, #b3e774, #000000" -color-urgent "#000000, #b3e774, #000000, #b3e774, #000000" -dmenu -i -p "locate:")"
@@ -241,7 +251,7 @@
- amixer set Master toggle
+ amixer set Speaker toggle
diff --git a/vdirsyncer/.config/vdirsyncer/config b/vdirsyncer/.config/vdirsyncer/config
index 7f7521e..666c71f 100644
--- a/vdirsyncer/.config/vdirsyncer/config
+++ b/vdirsyncer/.config/vdirsyncer/config
@@ -47,8 +47,8 @@ url = "https://coolneng.duckdns.org/radicale/"
username = "coolneng"
# The password can also be fetched from the system password storage, netrc or a
# custom command. See http://vdirsyncer.pimutils.org/en/stable/keyring.html
-password.fetch = ["command", "pass", "caldav"]
-verify_fingerprint = "81:74:1A:A8:18:DD:9F:91:A8:21:B3:B9:1F:A2:23:1E:DB:99:16:A6:37:1E:FC:84:08:F1:91:AA:16:44:75:FA"
+password.fetch = ["command", "pass", "cli/caldav"]
+verify_fingerprint = "8F:B0:B1:7F:30:8F:3B:C2:FD:9A:B8:72:1E:57:C7:64:78:8C:4A:9C:1E:EE:69:7C:DC:60:DF:02:DE:E2:8E:B2"
# CALDAV
[pair bob_calendar]
@@ -56,17 +56,33 @@ a = "bob_calendar_local"
b = "bob_calendar_remote"
collections = ["from a", "from b"]
+[pair google_calendar]
+a = "google_calendar_local"
+b = "google_calendar_remote"
+collections = ["from a", "from b"]
+
# Calendars also have a color property
metadata = ["displayname", "color"]
[storage bob_calendar_local]
type = "filesystem"
-path = "~/.calendars/"
+path = "~/.calendars/radicale"
fileext = ".ics"
[storage bob_calendar_remote]
type = "caldav"
url = "https://coolneng.duckdns.org/radicale/"
username = "coolneng"
-password.fetch = ["command", "pass", "caldav"]
-verify_fingerprint = "81:74:1A:A8:18:DD:9F:91:A8:21:B3:B9:1F:A2:23:1E:DB:99:16:A6:37:1E:FC:84:08:F1:91:AA:16:44:75:FA"
+password.fetch = ["command", "pass", "cli/caldav"]
+verify_fingerprint = "8F:B0:B1:7F:30:8F:3B:C2:FD:9A:B8:72:1E:57:C7:64:78:8C:4A:9C:1E:EE:69:7C:DC:60:DF:02:DE:E2:8E:B2"
+
+[storage google_calendar_local]
+type = "filesystem"
+path = "~/.calendars/google"
+fileext = ".ics"
+
+[storage google_calendar_remote]
+type = "google_calendar"
+token_file = "~/.gauth"
+client_id = "775357222304-1dpf6r6uqp7c9mn0imb0und5kaho5r7p.apps.googleusercontent.com"
+client_secret.fetch = ["command", "pass", "cli/gsuite"]