added vimperator, updated folder filter for email, updated vdirsyncer url

diff --git a/.config/i3/config b/.config/i3/config
index 823f9bc..4d180ad 100644 (file)
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -11,26 +11,21 @@
 
 set $mod Mod4
 
+# lock the screen after 10 minutes
 exec xautolock -locker 'i3lock -c ccff00; systemctl suspend'
+# set a background
 exec convert -size 1600x900 plasma:fractal -modulate 20,100,10 png:- | display -window root
+# set the backlight
 exec xbacklight -set 50
+# set the network switcher
 exec netctltray
 
 # Custom keybindings
 bindsym $mod+l exec xautolock -locknow
 bindsym $mod+p exec passmenu
 
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
+# Font for window titles.
 font pango:DejaVu Sans Mono 8
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -39,16 +34,11 @@ hide_edge_borders none
 # start a terminal
 bindsym $mod+Return exec i3-sensible-terminal
 
-
 # kill focused window
 bindsym $mod+Shift+quotedbl kill
 
 # start dmenu (a program launcher)
-bindsym $mod+e exec dmenu_run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+bindsym $mod+e exec dmenu_run -i -f -fn 'xft:DejaVu Sans Mono:style=Book:pixelsize=12'
 
 # change focus
 bindsym $mod+h focus left

diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config
index 209a90b..fb9ed33 100644 (file)
--- a/.config/vdirsyncer/config
+++ b/.config/vdirsyncer/config
@@ -26,7 +26,7 @@ fileext = .vcf
 
 [storage contacts_remote]
 type = carddav
-url = https://ygdrassil.martlubbers.net/card.php/addressbooks/mart/default
+url = https://ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart/default
 auth = digest
 username = mart
 
@@ -43,6 +43,6 @@ fileext = .ics
 
 [storage calendar_remote]
 type = caldav
-url = https://ygdrassil.martlubbers.net/cal.php/calendars/mart/default
+url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
 auth = digest
 username = mart

diff --git a/.mutt/offlineimap.py b/.mutt/offlineimap.py
index eac6dd2..02e4e2b 100644 (file)
--- a/.mutt/offlineimap.py
+++ b/.mutt/offlineimap.py
@@ -1,11 +1,18 @@
-#!/bin/env python
-# -*- coding: utf-8 -*-
-
 import subprocess
+import datetime
+import re
+
 
 def mailpasswd():
-    args = 'pass mail/mart@martlubbers.net'
-    try:
-        return subprocess.check_output(args, shell='/bin/bash').strip()
-    except subprocess.CalledProcessError:
-        return ""
+    return subprocess.check_output('pass mail/mart@martlubbers.net',
+                                   shell='/bin/bash').strip()
+
+
+def folderfilter(x):
+    match = re.match('archive\.(\d\d\d\d).(\d\d)', x)
+    if match:
+        return abs(datetime.date.today() -
+                   datetime.date(int(match.group(1)), int(match.group(2)), 1)
+                   ).days <= 31*2
+    else:
+        return not x.startswith('archive')

diff --git a/.mutt/offlineimaprc b/.mutt/offlineimaprc
index c3a6a46..107a1f4 100644 (file)
--- a/.mutt/offlineimaprc
+++ b/.mutt/offlineimaprc
@@ -8,6 +8,7 @@ ui = quiet
 localrepository = Local
 remoterepository = Remote
 postsynchook = notmuch new
+status_backend = sqlite
 
 [Repository Local]
 type = Maildir
@@ -15,6 +16,7 @@ localfolders = ~/.mutt/mail
 
 [Repository Remote]
 type = IMAP
+folderfilter = lambda x: folderfilter(x)
 remotepasseval = mailpasswd()
 remotehost = mail.martlubbers.net
 remoteuser = mart@martlubbers.net

diff --git a/.newsbeuter/config b/.newsbeuter/config
deleted file mode 100644 (file)
index 9bedb71..0000000
--- a/.newsbeuter/config
+++ /dev/null
@@ -1,3 +0,0 @@
-auto-reload yes
-datetime-format %F
-browser firefox

diff --git a/.vim/bundle/wmnusmv.vim b/.vim/bundle/wmnusmv.vim
new file mode 160000 (submodule)
index 0000000..a9fa46e
--- /dev/null
+++ b/.vim/bundle/wmnusmv.vim
@@ -0,0 +1 @@
+Subproject commit a9fa46eea8e667aa6413267a27209be18cae6622

diff --git a/.vimperatorrc b/.vimperatorrc
new file mode 100644 (file)
index 0000000..d8a1d7d
--- /dev/null
+++ b/.vimperatorrc
@@ -0,0 +1,7 @@
+"3.10.1 (created: 2015/08/25 00:41:59)
+
+source! /home/mart/.vimperatorrc.local
+nnoremap j 5j
+nnoremap k 5k
+
+" vim: set ft=vimperator:

diff --git a/install.sh b/install.sh
index 66f5fdb..c8d98f9 100644 (file)
--- a/install.sh
+++ b/install.sh
@@ -5,11 +5,10 @@ sudo localectl set-keymap --no-convert dvorak
 # Link the dotfiles
 hf=(.bashrc .gitconfig .inputrc .toprc
 .xinitrc .Xresources
-.vim .vimrc
+.vim .vimrc .vimperatorrc
 .mutt/mailcap .mutt/msmtprc .mutt/muttrc
 .mutt/offlineimap.py .mutt/offlineimaprc .mutt/notmuch-config 
 .config/i3/config .config/i3status/config
-.newsbeuter/config
 .config/khal/khal.conf
 .config/khard/khard.conf
 .config/vdirsyncer/config)