From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 17 Apr 2018 05:44:23 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=4ec32116d32f8b4457fffc431b9c2828be54e19c;hp=86aaaef21ac8fc9218515ec79a246013aec347c1;p=dotfiles.git

Merge branch 'master' of github.com:dopefishh/dotfiles
---

diff --git a/20-keyboard.conf b/20-keyboard.conf
index 835dcb0..687d125 100644
--- a/20-keyboard.conf
+++ b/20-keyboard.conf
@@ -5,5 +5,5 @@ Section "InputClass"
 	Option "XkbModel" "pc104"
 	Option "XkbLayout" "dvorak,ru,us"
 	Option "XkbVariant" ",phonetic_dvorak,"
-	Option "XKbOptions" "compose:ralt,grp:menu_toggle,caps:super"
+	Option "XKbOptions" "compose:ralt,grp:menu_toggle,ctrl:swapcaps"
 EndSection
diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config
index 4755b82..ee9d71f 100644
--- a/email/.config/msmtp/config
+++ b/email/.config/msmtp/config
@@ -18,6 +18,4 @@ tls on
 tls_fingerprint 1F:1D:F5:62:FC:9B:D4:BE:77:30:B1:F4:DB:24:49:F8:21:DD:6F:FC:08:1E:4A:78:0B:AC:C4:B4:FA:8E:A4:10
 user mlubbers
 passwordeval pass science.ru.nl/mlubbers
-from m.lubbers@cs.ru.nl
-proxy_host localhost
-proxy_port 8008
+from mart@cs.ru.nl
diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index 44ab8af..b197c42 100644
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -1,6 +1,8 @@
 # Basic information
 set from="mart@martlubbers.net"
-set use_from="yes
+alternates "mart@(cs\.ru\.nl|mart@martlubbers\.net)"
+set use_from=yes
+set reverse_name=yes
 set envelope_from=yes
 set mbox_type=Maildir
 set folder=~/.mutt/mail
@@ -18,6 +20,7 @@ macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"
 send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\""
 send2-hook "~f m.lubbers@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
 send2-hook "~f m.lubbers@science.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
+send2-hook "~f mart@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
 
 #folder-hook . push "<delete-pattern>~=<enter>$"
 
diff --git a/shell/.bashrc b/shell/.bashrc
index 91cb2f2..7db3f56 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -30,8 +30,8 @@ export COLORFGBG="default;default"
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias vi=vim
-alias tmux="tmux -f ~/.config/tmux/config"
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
+alias tmux='tmux -f ~/.config/tmux/config'
 
 set_prompt(){
 	last_c=$?
diff --git a/shell/.config/tmux/config b/shell/.config/tmux/config
new file mode 100644
index 0000000..f02f3a2
--- /dev/null
+++ b/shell/.config/tmux/config
@@ -0,0 +1,16 @@
+# prefix
+unbind C-b
+set-option -g prefix C-a
+bind C-a send-prefix
+
+# hjkl pane traversal
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# i3 window splitting
+unbind %
+unbind "
+bind v split-window -v
+bind h split-window -h
diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl
index a69a5ef..52581d6 100644
Binary files a/vim/.vim/spell/en.utf-8.add.spl and b/vim/.vim/spell/en.utf-8.add.spl differ
diff --git a/x/.config/i3/config b/x/.config/i3/config
index 1247e24..c6b06bb 100644
--- a/x/.config/i3/config
+++ b/x/.config/i3/config
@@ -30,7 +30,7 @@ floating_modifier $mod
 hide_edge_borders none
 
 # start a terminal
-bindsym $mod+Return exec /home/mrl/projects/st/st
+bindsym $mod+Return exec st
 
 # lock
 bindsym $mod+l exec xautolock -locknow
diff --git a/x/.xinitrc b/x/.xinitrc
index bbd42d8..dfabfa3 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,9 +1,6 @@
 #!/bin/bash
-urxvtd -q -o -f &
 xautolock -locker ~/.local/bin/lock.sh &
 dunst &
-compton -b
-~/.fehbg
 
 eval "$(gpg-agent --daemon)"
 xrdb -merge ~/.Xresources