vdirsyncer
This commit is contained in:
parent
628233969d
commit
3c9e2c3279
1
bashrc
1
bashrc
|
@ -43,6 +43,7 @@ alias rm='rm -Iv --one-file-system'
|
||||||
alias free='free -m'
|
alias free='free -m'
|
||||||
alias df='df -h'
|
alias df='df -h'
|
||||||
alias pacman='pacman --color auto'
|
alias pacman='pacman --color auto'
|
||||||
|
alias pacaur='pacaur --color auto'
|
||||||
alias dmesg='dmesg --ctime'
|
alias dmesg='dmesg --ctime'
|
||||||
|
|
||||||
# Frequent mistakes
|
# Frequent mistakes
|
||||||
|
|
7
config/i3/ashuffle
Executable file
7
config/i3/ashuffle
Executable file
|
@ -0,0 +1,7 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
while true
|
||||||
|
do
|
||||||
|
ashuffle
|
||||||
|
sleep 1
|
||||||
|
done
|
|
@ -371,6 +371,7 @@ exec --no-startup-id dunst # Notifications
|
||||||
exec --no-startup-id keynav # Keyboard cursor controller
|
exec --no-startup-id keynav # Keyboard cursor controller
|
||||||
#exec --no-startup-id $HOME/.config/i3/clipmenud # Clipboard manager
|
#exec --no-startup-id $HOME/.config/i3/clipmenud # Clipboard manager
|
||||||
exec --no-startup-id mpd # Music Player Daemon
|
exec --no-startup-id mpd # Music Player Daemon
|
||||||
|
exec --no-startup-id ~/.config/i3/ashuffle # MPD Auto-refill
|
||||||
exec --no-startup-id autorandr --change # Screen configuration and everything that depends on it
|
exec --no-startup-id autorandr --change # Screen configuration and everything that depends on it
|
||||||
|
|
||||||
set $ignore #ff00000
|
set $ignore #ff00000
|
||||||
|
|
38
config/khal/config
Normal file
38
config/khal/config
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
[calendars]
|
||||||
|
[[perso]]
|
||||||
|
path = ~/.vdirsyncer/calendars/perso/
|
||||||
|
color = light green
|
||||||
|
|
||||||
|
[[clubs]]
|
||||||
|
path = ~/.vdirsyncer/calendars/clubs/
|
||||||
|
color = yellow
|
||||||
|
|
||||||
|
[[cours]]
|
||||||
|
path = ~/.vdirsyncer/calendars/cours/
|
||||||
|
color = light blue
|
||||||
|
readonly = True
|
||||||
|
|
||||||
|
[[polytech]]
|
||||||
|
path = ~/.vdirsyncer/calendars/polytech/
|
||||||
|
color = dark blue
|
||||||
|
|
||||||
|
[[bnei]]
|
||||||
|
path = ~/.vdirsyncer/calendars/bnei/
|
||||||
|
color = light cyan
|
||||||
|
|
||||||
|
# [[birthdays]]
|
||||||
|
# type=birthdays
|
||||||
|
# path = ~/.vdirsyncer/contacts/contacts/
|
||||||
|
# color = light magenta
|
||||||
|
|
||||||
|
[locale]
|
||||||
|
timeformat = %H:%M
|
||||||
|
dateformat = %d/%m
|
||||||
|
longdateformat = %d/%m/%Y
|
||||||
|
datetimeformat = %d/%m %H:%M
|
||||||
|
longdatetimeformat = %d/%m/%Y %H:%M
|
||||||
|
local_timezone = Europe/Paris
|
||||||
|
|
||||||
|
[default]
|
||||||
|
highlight_event_days = True
|
||||||
|
|
43
config/khard/khard.conf
Normal file
43
config/khard/khard.conf
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
# example configuration file for khard version >= 0.11.0
|
||||||
|
# place it under $HOME/.config/khard/khard.conf
|
||||||
|
|
||||||
|
[addressbooks]
|
||||||
|
[[contacts]]
|
||||||
|
path = ~/.vdirsyncer/contacts/contacts/
|
||||||
|
|
||||||
|
[general]
|
||||||
|
debug = no
|
||||||
|
default_action = list
|
||||||
|
editor = vim
|
||||||
|
merge_editor = vimdiff
|
||||||
|
|
||||||
|
[contact table]
|
||||||
|
# display names by first or last name: first_name / last_name
|
||||||
|
display = first_name
|
||||||
|
# group by address book: yes / no
|
||||||
|
group_by_addressbook = no
|
||||||
|
# reverse table ordering: yes / no
|
||||||
|
reverse = no
|
||||||
|
# append nicknames to name column: yes / no
|
||||||
|
show_nicknames = no
|
||||||
|
# show uid table column: yes / no
|
||||||
|
show_uids = yes
|
||||||
|
# sort by first or last name: first_name / last_name
|
||||||
|
sort = last_name
|
||||||
|
# localize dates: yes / no
|
||||||
|
localize_dates = yes
|
||||||
|
|
||||||
|
[vcard]
|
||||||
|
# extend contacts with your own private objects
|
||||||
|
# these objects are stored with a leading "X-" before the object name in the vcard files
|
||||||
|
# every object label may only contain letters, digits and the - character
|
||||||
|
# example:
|
||||||
|
# private_objects = Jabber, Skype, Twitter
|
||||||
|
private_objects = Jabber, Skype, Twitter
|
||||||
|
# preferred vcard version: 3.0 / 4.0
|
||||||
|
preferred_version = 3.0
|
||||||
|
# Look into source vcf files to speed up search queries: yes / no
|
||||||
|
search_in_source_files = no
|
||||||
|
# skip unparsable vcard files: yes / no
|
||||||
|
skip_unparsable = no
|
||||||
|
|
1
config/systemd/user/default.target.wants/syncthing.service
Symbolic link
1
config/systemd/user/default.target.wants/syncthing.service
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
/home/geoffrey/.local/share/systemd/user/syncthing.service
|
1
config/systemd/user/timers.target.wants/vdirsyncer.timer
Symbolic link
1
config/systemd/user/timers.target.wants/vdirsyncer.timer
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
/home/geoffrey/.local/share/systemd/user/vdirsyncer.timer
|
4
config/todoman/todoman.conf
Normal file
4
config/todoman/todoman.conf
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
[main]
|
||||||
|
path = ~/.vdirsyncer/calendars/*
|
||||||
|
default_list = perso
|
||||||
|
humanize = True
|
0
config/vdirsyncer/.dfrecur
Normal file
0
config/vdirsyncer/.dfrecur
Normal file
68
config/vdirsyncer/config
Normal file
68
config/vdirsyncer/config
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
# An example configuration for vdirsyncer.
|
||||||
|
#
|
||||||
|
# Move it to ~/.vdirsyncer/config or ~/.config/vdirsyncer/config and edit it.
|
||||||
|
# Run `vdirsyncer --help` for CLI usage.
|
||||||
|
#
|
||||||
|
# Optional parameters are commented out.
|
||||||
|
# This file doesn't document all available parameters, see
|
||||||
|
# http://vdirsyncer.pimutils.org/ for the rest of them.
|
||||||
|
|
||||||
|
[general]
|
||||||
|
# A folder where vdirsyncer can store some metadata about each pair.
|
||||||
|
status_path = "~/.vdirsyncer/status/"
|
||||||
|
|
||||||
|
# # CARDDAV
|
||||||
|
[pair geoffrey_contacts]
|
||||||
|
# A `[pair <name>]` block defines two storages `a` and `b` that should be
|
||||||
|
# synchronized. The definition of these storages follows in `[storage <name>]`
|
||||||
|
# blocks. This is similar to accounts in OfflineIMAP.
|
||||||
|
a = "geoffrey_contacts_local"
|
||||||
|
b = "geoffrey_contacts_remote"
|
||||||
|
|
||||||
|
# Synchronize all collections that can be found.
|
||||||
|
# You need to run `vdirsyncer discover` if new calendars/addressbooks are added
|
||||||
|
# on the server.
|
||||||
|
|
||||||
|
collections = ["from a", "from b"]
|
||||||
|
|
||||||
|
# Synchronize the "display name" property into a local file (~/.contacts/displayname).
|
||||||
|
metadata = ["displayname"]
|
||||||
|
|
||||||
|
# To resolve a conflict the following values are possible:
|
||||||
|
# `null` - abort when collisions occur (default)
|
||||||
|
# `"a wins"` - assume a's items to be more up-to-date
|
||||||
|
# `"b wins"` - assume b's items to be more up-to-date
|
||||||
|
#conflict_resolution = null
|
||||||
|
|
||||||
|
[storage geoffrey_contacts_local]
|
||||||
|
# A storage references actual data on a remote server or on the local disk.
|
||||||
|
# Similar to repositories in OfflineIMAP.
|
||||||
|
type = "filesystem"
|
||||||
|
path = "~/.vdirsyncer/contacts/"
|
||||||
|
fileext = ".vcf"
|
||||||
|
|
||||||
|
[storage geoffrey_contacts_remote]
|
||||||
|
type = "carddav"
|
||||||
|
url = "https://dav.frogeye.fr/caldav.php/"
|
||||||
|
username = "geoffrey"
|
||||||
|
password.fetch = ["command", "sh", "-c", "cat ~/.config/vdirsyncer/pass"]
|
||||||
|
|
||||||
|
# CALDAV
|
||||||
|
[pair geoffrey_calendar]
|
||||||
|
a = "geoffrey_calendar_local"
|
||||||
|
b = "geoffrey_calendar_remote"
|
||||||
|
collections = ["from a", "from b"]
|
||||||
|
|
||||||
|
# Calendars also have a color property
|
||||||
|
metadata = ["displayname", "color"]
|
||||||
|
|
||||||
|
[storage geoffrey_calendar_local]
|
||||||
|
type = "filesystem"
|
||||||
|
path = "~/.vdirsyncer/calendars/"
|
||||||
|
fileext = ".ics"
|
||||||
|
|
||||||
|
[storage geoffrey_calendar_remote]
|
||||||
|
type = "caldav"
|
||||||
|
url = "https://dav.frogeye.fr/caldav.php/"
|
||||||
|
username = "geoffrey"
|
||||||
|
password.fetch = ["command", "sh", "-c", "cat ~/.config/vdirsyncer/pass"]
|
|
@ -8,3 +8,8 @@
|
||||||
default = matching
|
default = matching
|
||||||
[alias]
|
[alias]
|
||||||
git = !exec git
|
git = !exec git
|
||||||
|
[filter "lfs"]
|
||||||
|
clean = git-lfs clean -- %f
|
||||||
|
smudge = git-lfs smudge -- %f
|
||||||
|
process = git-lfs filter-process
|
||||||
|
required = true
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
sudo kexec -l /boot/vmlinuz-linux --initrd=/boot/initramfs-linux.img --reuse-cmdlin
|
sudo kexec -l /boot/vmlinuz-linux --initrd=/boot/initramfs-linux.img --reuse-cmdline
|
||||||
sudo systemctl kexec
|
sudo systemctl kexec
|
||||||
|
|
|
@ -167,6 +167,10 @@ function altInst {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function systemdUserUnit {
|
||||||
|
mkdir -p ~/.local/share/systemd
|
||||||
|
ln -s /usr/lib/systemd/user/vdirsyncer.timer ~/.local/share/systemd/
|
||||||
|
}
|
||||||
|
|
||||||
# Common CLI
|
# Common CLI
|
||||||
|
|
||||||
|
@ -315,16 +319,25 @@ if [ $GUI == 1 ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ $EXTRA == 1 ]; then
|
if [ $EXTRA == 1 ]; then
|
||||||
# Extra dev
|
# Extra dev
|
||||||
inst cmake clang llvm npm
|
inst cmake clang llvm npm
|
||||||
|
|
||||||
# Extra CLI
|
# Extra CLI
|
||||||
inst ffmpeg youtube-dl optipng syncthing ccache
|
inst ffmpeg youtube-dl optipng syncthing ccache
|
||||||
|
systemdUserUnit syncthing.service
|
||||||
|
|
||||||
if [ $ARCH == 1 ]; then
|
if [ $ARCH == 1 ]; then
|
||||||
inst jq
|
inst jq
|
||||||
altInst pdftk translate-shell git-lfs js-beautify insect visidata-git
|
altInst pdftk translate-shell git-lfs js-beautify insect visidata-git
|
||||||
|
|
||||||
|
# Orga
|
||||||
|
# TODO For others
|
||||||
|
inst vdirsyncer khard
|
||||||
|
altInst khal todoman
|
||||||
|
systemdUserUnit vdirsyncer.service
|
||||||
|
systemdUserUnit vdirsyncer.timer
|
||||||
else
|
else
|
||||||
# translate-shell
|
# translate-shell
|
||||||
curl -L git.io/trans > ~/.bin/trans
|
curl -L git.io/trans > ~/.bin/trans
|
||||||
|
@ -337,7 +350,7 @@ if [ $EXTRA == 1 ]; then
|
||||||
|
|
||||||
if [ $ARCH == 1 ]; then
|
if [ $ARCH == 1 ]; then
|
||||||
inst simplescreenrecorder
|
inst simplescreenrecorder
|
||||||
altInst pacmixer xcursor-menda-git menda-themes-git menda-maia-icon-theme vimpc-git mpc
|
altInst pacmixer xcursor-menda-git menda-themes-git menda-maia-icon-theme vimpc-git mpc ashuffle-git
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -127,6 +127,10 @@ function _machines-getAkey { # network
|
||||||
SIGN_FILE=$(mktemp)
|
SIGN_FILE=$(mktemp)
|
||||||
_machines-api akey/$1 > $KEY_FILE
|
_machines-api akey/$1 > $KEY_FILE
|
||||||
_machines-api akey/$1?signature > $SIGN_FILE
|
_machines-api akey/$1?signature > $SIGN_FILE
|
||||||
|
md5sum $KEY_FILE &> /dev/stderr
|
||||||
|
md5sum $SIGN_FILE &> /dev/stderr
|
||||||
|
md5sum $MACHINES_CONFIG/machines.pub &> /dev/stderr
|
||||||
|
|
||||||
openssl dgst -sha256 -verify $MACHINES_CONFIG/machines.pub -signature $SIGN_FILE $KEY_FILE &> /dev/null
|
openssl dgst -sha256 -verify $MACHINES_CONFIG/machines.pub -signature $SIGN_FILE $KEY_FILE &> /dev/null
|
||||||
if [ $? == 0 ]; then
|
if [ $? == 0 ]; then
|
||||||
cat $KEY_FILE
|
cat $KEY_FILE
|
||||||
|
|
2
scripts/rms
Executable file
2
scripts/rms
Executable file
|
@ -0,0 +1,2 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
find . -name "*.sync-conflict-*" -delete
|
2
vimrc
2
vimrc
|
@ -48,7 +48,7 @@ nmap <F7> :UndotreeToggle<CR>:UndotreeFocus<CR>
|
||||||
|
|
||||||
let g:ctrlp_custom_ignore = {
|
let g:ctrlp_custom_ignore = {
|
||||||
\ 'dir': '\v([\/]\.(git|hg|svn)|log|node_modules|bower_components|__pycache__|vendor|output|buildroot|doc)$',
|
\ 'dir': '\v([\/]\.(git|hg|svn)|log|node_modules|bower_components|__pycache__|vendor|output|buildroot|doc)$',
|
||||||
\ 'file': '\v\.(exe|so|dll|o|pyc)$',
|
\ 'file': '\v\.(exe|so|dll|o|pyc|a)$',
|
||||||
\ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
|
\ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
|
||||||
\ }
|
\ }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue