From e6b783e071e7068c9ec215aa24422508858c015d Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 27 Oct 2015 13:20:12 +0100 Subject: [PATCH] Lots of updates Less as a default pager Support for pip local packages in $PATH Khard, Khal and vdirsyncer support msmtp pass update --- .bashrc | 5 +++-- .config/khal/khal.conf | 21 +++++++++++---------- .config/khard/khard.conf | 9 +++++++++ .config/vdirsyncer/config | 37 +++++++++++++++++++++++++++++++++---- .mutt/msmtprc | 2 +- .vimrc | 2 +- install.sh | 4 +++- 7 files changed, 61 insertions(+), 19 deletions(-) create mode 100644 .config/khard/khard.conf diff --git a/.bashrc b/.bashrc index 47ca5d5..a75e47e 100644 --- a/.bashrc +++ b/.bashrc @@ -12,12 +12,13 @@ export TERMINAL=urxvtc export EDITOR=vim export TERM=screen export BROWSER=firefox - +export PAGER=less export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass export NOTMUCH_CONFIG=/home/mart/.mutt/notmuch-config -export PATH=$PATH:~/projects/clean/bin +export CLEAN_HOME=~/projects/clean +export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin:~/.local/bin alias ls='ls --color=auto' alias grep='grep --color=auto' diff --git a/.config/khal/khal.conf b/.config/khal/khal.conf index 10b3506..3f4f544 100644 --- a/.config/khal/khal.conf +++ b/.config/khal/khal.conf @@ -1,20 +1,21 @@ [calendars] -[[home]] -path = ~/.calendars/ -color = dark blue +[[dav]] +path = ~/.vdirsyncer/calendar/ +color = white [sqlite] -path = ~/.config/khal/khal.db +path = ~/.vdirsyncer/khal.db [locale] timeformat = %H:%M -dateformat = %d-%m (%a) -longdateformat = %Y-%m-%d (%a) -datetimeformat = %m-%d %H:%M (%a) -longdatetimeformat = %Y-%m-%d %H:%M (%a) +dateformat = %d.%m. +longdateformat = %d.%m.%Y +datetimeformat = %d.%m. %H:%M +longdatetimeformat = %d.%m.%Y %H:%M + +firstweekday = 0 [default] default_command = calendar -default_calendar = home +default_calendar = dav show_all_days = True -#debug = 0 diff --git a/.config/khard/khard.conf b/.config/khard/khard.conf new file mode 100644 index 0000000..d5838d9 --- /dev/null +++ b/.config/khard/khard.conf @@ -0,0 +1,9 @@ +[addressbooks] +[[dav]] +path = ~/.vdirsyncer/addressbook/ + +[general] +editor = vim +merge_editor = vimdiff +default_action = list +show_nicknames = no diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config index 9e5bcfd..39e2b01 100644 --- a/.config/vdirsyncer/config +++ b/.config/vdirsyncer/config @@ -1,17 +1,46 @@ +# 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.readthedocs.org/ for the rest of them. + [general] -status_path = ~/.config/vdirsyncer/status/ -password_command = pass caldav_ygdrassil/mart +# A folder where vdirsyncer can store some metadata about each pair. +status_path = ~/.vdirsyncer/status/ +password_command = pass show caldav_ygdrassil/mart + +# CARDDAV +[pair contacts] +a = contacts_local +b = contacts_remote + +collections = ["from b"] + +[storage contacts_local] +type = filesystem +path = ~/.vdirsyncer/ +fileext = .vcf + +[storage contacts_remote] +type = carddav +url = http://localhost:8008/addressbooks/users/mart/addressbook/ +username = mart +# CALDAV [pair calendar] a = calendar_local b = calendar_remote +collections = ["from b"] [storage calendar_local] type = filesystem -path = ~/.calendars/ +path = ~/.vdirsyncer/ fileext = .ics [storage calendar_remote] type = caldav -url = http://localhost:8008/calendars/users/mart/calendar +url = http://localhost:8008/calendars/users/mart/calendar/ username = mart diff --git a/.mutt/msmtprc b/.mutt/msmtprc index f2b2054..cd56da1 100644 --- a/.mutt/msmtprc +++ b/.mutt/msmtprc @@ -5,5 +5,5 @@ auth on tls on tls_certcheck off user mart@martlubbers.net -passwordeval gpg -qd --use-agent ~/pw/mail.asc | grep -A4 "^mart@martlubbers.net" | grep -Po "(?<=pass: ).*" +passwordeval pass mail/mart@martlubbers.net from mart@martlubbers.net diff --git a/.vimrc b/.vimrc index 4669c6c..a484c4a 100644 --- a/.vimrc +++ b/.vimrc @@ -26,7 +26,7 @@ set textwidth=79 " List characters to mark trailing whitespace etc set listchars=nbsp:¬,tab:▸\ ,eol:↩,extends:»,precedes:«,trail:• -set list +set nolist " Move through long lines as they were short multiple lines map j gj diff --git a/install.sh b/install.sh index 22a631a..66f5fdb 100644 --- a/install.sh +++ b/install.sh @@ -10,7 +10,9 @@ hf=(.bashrc .gitconfig .inputrc .toprc .mutt/offlineimap.py .mutt/offlineimaprc .mutt/notmuch-config .config/i3/config .config/i3status/config .newsbeuter/config -.config/khal/khal.conf .config/vdirsyncer/config) +.config/khal/khal.conf +.config/khard/khard.conf +.config/vdirsyncer/config) for f in ${hf[*]} do unlink "$HOME/$f" || true -- 2.20.1