update calendars and i3

diff --git a/cal/.config/khal/khal.conf b/cal/.config/khal/khal.conf
index bcad0c4..9f3745e 100644 (file)
--- a/cal/.config/khal/khal.conf
+++ b/cal/.config/khal/khal.conf
@@ -1,7 +1,19 @@
 [calendars]
-[[dav]]
+[[mart]]
+path = ~/.vdirsyncer/cal/mart
+color = light green
+
+[[elvira]]
+path = ~/.vdirsyncer/cal/elvira
+color = light red
+
+[[default]]
 path = ~/.vdirsyncer/cal/default
-color = white
+color = light blue
+
+[[vuilnis]]
+path = ~/.vdirsyncer/cal/vuilnis
+color = brown
 
 [sqlite]
 path = ~/.vdirsyncer/khal.db
@@ -17,5 +29,5 @@ firstweekday = 0
 
 [default]
 default_command = calendar
-default_calendar = dav
+default_calendar = mart
 show_all_days = True

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index fb9ed33..c610395 100644 (file)
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -34,7 +34,7 @@ username = mart
 [pair calendar]
 a = calendar_local
 b = calendar_remote
-collections = ["from b"]
+collections = ["default", "mart", "elvira", "vuilnis"]
 
 [storage calendar_local]
 type = filesystem

diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index 8036a9b..39af2ba 100644 (file)
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -14,12 +14,7 @@ source ~/.mutt/mailboxes
 set sendmail="msmtp -C /home/mart/.mutt/msmtprc"
 macro index,pager $ "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter><sync-mailbox>" "Force refresh"
 macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"
-macro index <F8> \
-       "<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
-       <shell-escape>notmuch-mutt -r --prompt search<enter>\
-       <change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter>\
-       <enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
-       "notmuch: search mail"
+source /etc/Muttrc.d/notmuch-mutt.rc
 
 # Key bindings
 bind index gg first-entry
@@ -92,7 +87,7 @@ color index red default ~D
 color index brightblue default ~F
 
 # Crypto
-source /etc/Muttrc.gpg.dist
+source /etc/Muttrc.d/gpg.rc
 set crypt_autosign
 set crypt_replysign
 set crypt_replysignencrypted=yes

diff --git a/x/.config/i3/config b/x/.config/i3/config
index c25afcb..1192360 100644 (file)
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@ -10,6 +10,8 @@
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
 
 set $mod Mod4
+set $font DejaVu Sans Mono
+set $fontsize 12
 
 # lock the screen after 10 minutes
 exec xautolock -locker 'echo RELOADAGENT | gpg-connect-agent; i3lock'
@@ -27,7 +29,7 @@ bindsym Print exec ~/.local/bin/scr
 # lock the screen
 bindsym $mod+l exec xautolock -locknow
 # put a password in the clipboard
-bindsym $mod+p exec ~/.local/bin/passmenu
+bindsym $mod+y exec ~/.local/bin/passmenu
 
 # font for window titles.
 font pango:DejaVu Sans Mono 8
@@ -43,7 +45,7 @@ bindsym $mod+Return exec i3-sensible-terminal
 bindsym $mod+Shift+quotedbl kill
 
 # start dmenu
-bindsym $mod+e exec dmenu_run -i -f -fn 'xft:DejaVu Sans Mono:style=Book:pixelsize=12'
+bindsym $mod+e exec dmenu_run -i -f -fn 'xft:$font:pixelsize=$fontsize'
 
 # change focus
 bindsym $mod+h focus left
@@ -121,35 +123,24 @@ bindsym $mod+Shift+p restart
 bindsym $mod+Shift+period exec i3-msg exit
 
 # resize window (you can also use the mouse for that)
-#mode "resize" {
-#        # These bindings trigger as soon as you enter the resize mode
-#
-#        # Pressing left will shrink the window’s width.
-#        # Pressing right will grow the window’s width.
-#        # Pressing up will shrink the window’s height.
-#        # Pressing down will grow the window’s height.
-#        bindsym h resize shrink width 10 px or 10 ppt
-#        bindsym t resize grow height 10 px or 10 ppt
-#        bindsym n resize shrink height 10 px or 10 ppt
-#        bindsym s resize grow width 10 px or 10 ppt
-#
-#        # same bindings, but for the arrow keys
-#        bindsym Left resize shrink width 10 px or 10 ppt
-#        bindsym Down resize grow height 10 px or 10 ppt
-#        bindsym Up resize shrink height 10 px or 10 ppt
-#        bindsym Right resize grow width 10 px or 10 ppt
-#
-#        # back to normal: Enter or Escape
-#        bindsym Return mode "default"
-#        bindsym Escape mode "default"
-#}
-#
-#bindsym $mod+p mode "resize"
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+        bindsym h resize shrink width 5 px or 5 ppt
+        bindsym t resize grow height 5 px or 5 ppt
+        bindsym n resize shrink height 5 px or 5 ppt
+        bindsym s resize grow width 5 px or 5 ppt
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+bindsym $mod+p mode "resize"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
        status_command i3status
        modifier $mod
-       font pango:DejaVu Sans Mono 12
+       font pango:$font $fontsize
 }

diff --git a/x/.config/user-dirs.dirs b/x/.config/user-dirs.dirs
index 91f2ad4..37a80f9 100644 (file)
--- a/x/.config/user-dirs.dirs
+++ b/x/.config/user-dirs.dirs
@@ -5,11 +5,11 @@
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
 # 
-XDG_DESKTOP_DIR="$HOME/"
+XDG_DESKTOP_DIR="$HOME"
 XDG_DOWNLOAD_DIR="$HOME/downloads"
-XDG_TEMPLATES_DIR="$HOME/"
-XDG_PUBLICSHARE_DIR="$HOME/"
+XDG_TEMPLATES_DIR="$HOME"
+XDG_PUBLICSHARE_DIR="$HOME"
 XDG_DOCUMENTS_DIR="$HOME/documents"
 XDG_MUSIC_DIR="$HOME/music"
 XDG_PICTURES_DIR="$HOME/pictures"
-XDG_VIDEOS_DIR="$HOME/"
+XDG_VIDEOS_DIR="$HOME"