From b927997e2f22f49b645c26a561d275672fca0fae Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 17 Sep 2015 18:09:56 +0200
Subject: [PATCH] Big updates, ie khal+vdirsyncer

- removed limits on bash history
- removed python startup
- changed i3 modifier to super(capslock on my laptop)
- added khal and vdirsyncer(via ssh)
- removed mutt confirmappend
- removed notmuch compact because it can take long
- newsbeuter firefox hardcoding, planning on removing newsbeuter tho and move
  it to my desktop solely
- changed compose to ralt and removed qwerty map
---
 .bashrc                   |  9 +++++----
 .config/i3/config         |  2 +-
 .config/khal/khal.conf    | 20 ++++++++++++++++++++
 .config/vdirsyncer/config | 17 +++++++++++++++++
 .mutt/muttrc              |  2 +-
 .mutt/offlineimaprc       |  2 +-
 .newsbeuter/config        |  1 +
 install.sh                |  5 +++--
 8 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 .config/khal/khal.conf
 create mode 100644 .config/vdirsyncer/config

diff --git a/.bashrc b/.bashrc
index f115eb6..47ca5d5 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,5 +1,10 @@
 shopt -s checkwinsize
+
+export HISTCONTROL=erasedups
+export HISTFILESIZE=NOTHING
+export HISTSIZE=NOTHING
 shopt -s histappend
+export PROMPT_COMMAND='history -a'
 
 . /usr/share/bash-completion/bash_completion
 
@@ -8,13 +13,9 @@ export EDITOR=vim
 export TERM=screen
 export BROWSER=firefox
 
-export HISTFILESIZE=10000
-export HISTSIZE=100000
-export HISTCONTROL=ignoreboth
 
 export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
 export NOTMUCH_CONFIG=/home/mart/.mutt/notmuch-config
-export PYTHONSTARTUP=/home/mart/.pythonstartup
 
 export PATH=$PATH:~/projects/clean/bin
 
diff --git a/.config/i3/config b/.config/i3/config
index fa8694d..fe3844b 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -9,7 +9,7 @@
 #
 # Please see http://i3wm.org/docs/userguide.html for a complete reference!
 
-set $mod Mod1
+set $mod Mod4
 
 exec xautolock -locker 'i3lock -c ccff00; systemctl suspend'
 exec convert -size 1600x900 plasma:fractal -modulate 20,100,10 png:- | display -window root
diff --git a/.config/khal/khal.conf b/.config/khal/khal.conf
new file mode 100644
index 0000000..10b3506
--- /dev/null
+++ b/.config/khal/khal.conf
@@ -0,0 +1,20 @@
+[calendars]
+[[home]]
+path = ~/.calendars/
+color = dark blue
+
+[sqlite]
+path = ~/.config/khal/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)
+
+[default]
+default_command = calendar
+default_calendar = home
+show_all_days = True
+#debug = 0
diff --git a/.config/vdirsyncer/config b/.config/vdirsyncer/config
new file mode 100644
index 0000000..8cd811e
--- /dev/null
+++ b/.config/vdirsyncer/config
@@ -0,0 +1,17 @@
+[general]
+status_path = ~/.config/vdirsyncer/status/
+password_command = ~/.config/i3/gpass.sh calendar
+
+[pair calendar]
+a = calendar_local
+b = calendar_remote
+
+[storage calendar_local]
+type = filesystem
+path = ~/.calendars/
+fileext = .ics
+
+[storage calendar_remote]
+type = caldav
+url = http://localhost:8008/calendars/users/mart/calendar
+username = mart
diff --git a/.mutt/muttrc b/.mutt/muttrc
index f87bb6f..b6417e3 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -35,7 +35,7 @@ set timeout=2
 set mail_check=0
 set include=yes
 set delete=yes
-set confirmappend=yes
+set confirmappend=no
 set fast_reply=yes
 
 # Display options
diff --git a/.mutt/offlineimaprc b/.mutt/offlineimaprc
index 064829f..c3a6a46 100644
--- a/.mutt/offlineimaprc
+++ b/.mutt/offlineimaprc
@@ -7,7 +7,7 @@ ui = quiet
 [Account net]
 localrepository = Local
 remoterepository = Remote
-postsynchook = notmuch new && notmuch compact
+postsynchook = notmuch new
 
 [Repository Local]
 type = Maildir
diff --git a/.newsbeuter/config b/.newsbeuter/config
index 9f96901..9bedb71 100644
--- a/.newsbeuter/config
+++ b/.newsbeuter/config
@@ -1,2 +1,3 @@
 auto-reload yes
 datetime-format %F
+browser firefox
diff --git a/install.sh b/install.sh
index ca17cbf..0318a8c 100644
--- a/install.sh
+++ b/install.sh
@@ -1,12 +1,13 @@
 # Set keymaps
-sudo localectl set-x11-keymap --no-convert dvorak,us,ru pc104 ,,phonetic_dvorak grp:shifts_toggle,compose:caps
+sudo localectl set-x11-keymap --no-convert dvorak,ru pc104 ,phonetic_dvorak grp:shifts_toggle,compose:ralt
 sudo localectl set-keymap --no-convert dvorak
 
 # Link the dotfiles
 hf=(.bashrc .gitconfig .inputrc .vimrc .xinitrc .Xresources .toprc
 .vim .mutt/mailcap .mutt/msmtprc .mutt/muttrc .mutt/offlineimap.py
 .mutt/offlineimaprc .mutt/notmuch-config .config/i3/bar .config/i3/config
-.config/i3/gpass.sh .config/i3status/config .newsbeuter/config)
+.config/i3/gpass.sh .config/i3status/config .newsbeuter/config
+.config/khal/khal.conf .config/vdirsyncer/config)
 for f in ${hf[*]}
 do
 	unlink "$HOME/$f" || true
-- 
2.20.1