Merge branch 'master' of https://www.github.com/Vaskozl/dotfiles

5 files changed, 35 insertions, 5 deletions

diff --git a/Xresources b/Xresources
index 36e6793..270f442 100644
--- a/Xresources
+++ b/Xresources
@@ -1,3 +1,5 @@
+Xcursor.theme: XcursorHuman
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Solarized Config for Xterm                  !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/bashrc b/bashrc
index 803933f..c554c9a 100644
--- a/bashrc
+++ b/bashrc
@@ -118,5 +118,6 @@ shopt -s cdspell
 
 export GPGKEY="895134C5"
 export PATH="$HOME/bin:$HOME/bin/perl6:$PATH"
+export EDITOR="vim"
 export PENTADACTYL_RUNTIME="$HOME/.pentadactyl"
 export LD_LIBRARY_PATH=/usr/local/lib       
diff --git a/mutt/mailcap b/mutt/mailcap
new file mode 100644
index 0000000..c2ffbc4
--- /dev/null
+++ b/mutt/mailcap
@@ -0,0 +1,4 @@
+application/*; mkdir -p /tmp/mutt \; cp %s /tmp/mutt \; rifle /tmp/mutt/$(basename %s) &
+image/*; mkdir -p /tmp/mutt \; cp %s /tmp/mutt \; rifle /tmp/mutt/$(basename %s) &
+text/html; ~/.ratpoison/firesend %s &; test=test -n "$DISPLAY"; needsterminal;
+text/html; w3m -I %{charset} -T text/html; copiousoutput;
diff --git a/muttrc b/muttrc
index e7abfe1..94685b5 100644
--- a/muttrc
+++ b/muttrc
@@ -58,6 +58,22 @@ hdr_order Date From To Cc
 alternative_order text/plain text/html *
 auto_view text/html
 
+# Hide crap
+
+ignore lines precedence status message-id x-lines x-loop x-sender
+ignore nntp-posting-host old-return-path received references
+ignore content- errors-to mime-version resent- return-path xref
+ignore conversion original-encoded-information-types x400 x-vm-
+ignore x-sun x-status x-vm- illegal-object x-authentication-warning
+ignore originator x-received x-listprocessor x-mailinglist
+ignore old-priority priority x-msmail-priority old-x-envelope-to
+ignore x-envelope-to x-gateway x-z-charset x-forward-loop x-comment
+ignore comments x-pmrqc x-face x-envelope-sender from_ x-mailing-list
+ignore x-copyright x-cid-url sender x-ixthys-url x-priority
+ignore x-no-junk-mail x-server-date x-phone x-mime-autoconverted
+ignore x-alt-email x-orcpt company division x-warning
+
+
 # Gmail-style keyboard shortcuts
 macro index,pager gi "<change-folder>=Gmail/INBOX<enter>" "Go to inbox"
 macro index,pager ga "<change-folder>=Gmail/archive<tab><enter>" "Go to all mail"
@@ -98,7 +114,9 @@ set display_filter='$HOME/.mutt/alias.sh'
 # Mutt LED notification 
 set status_format="$HOME/.mutt/notify.sh '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|"
 
-#click link
-macro pager \cb 'urlview' 'Follow links with urlview'
-
+# Render silly html
+set mailcap_path 	= ~/.mutt/mailcap
+folder-hook . `rm -f /tmp/mutt/*`                        # delete tmp files created by mailcap
+auto_view text/html                                      # view html automatically
+alternative_order text/plain text/enriched text/html     # save html for last
 
diff --git a/xinitrc b/xinitrc
index 9f73696..b1da90c 100755
--- a/xinitrc
+++ b/xinitrc
@@ -45,13 +45,18 @@ xautolock -detectsleep -locker i3lock -time 11 -corners 0-00 &
 xrdb -merge ~/.Xresources
 xrdb -merge ~/.Xdefaults
 # Start some programs
-#dropbox start
+dropboxd
 ~/bin/offline-run
 #~/bin/xflux -z 24531 -l 56 -g 13
 #sudo nm-applet &
 
 #Disable annoying point tap
-synclient VertEdgeScroll=0  RTCornerButton=0  RBCornerButton=0  LTCornerButton=0  LBCornerButton=0  PalmDetect=1  FingerHigh=37  FingerLow=35  FingerPress=100 
+synclient PalmDetect=1
+synclient TapButton1=1
+synclient TapButton2=3
+synclient TapButton3=2
+synclient TapAndDragGesture=0
+synclient VertEdgeScroll=0  RTCornerButton=0  RBCornerButton=0  LTCornerButton=0  LBCornerButton=0    FingerHigh=37  FingerLow=35  FingerPress=100 
 #Natural Scrolling 
 xmodmap -e "pointer = 1 2 3 5 4 7 6 8 9 10 11 12"