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

15 files changed, 189 insertions, 15 deletions

diff --git a/.gitmodules b/.gitmodules
index 885a1cc..00b35e2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,6 +19,9 @@
 [submodule ".vim/bundle/supertab"]
 	path = vim/.vim/bundle/supertab
 	url = https://github.com/ervandew/supertab.git
+[submodule ".vim/bundle/semantic-highlight"]
+  path = vim/.vim/bundle/semantic-highlight
+  url = https://github.com/jaxbot/semantic-highlight.vim.git
 [submodule ".vim/bundle/tagbar"]
 	path = vim/.vim/bundle/tagbar
 	url = https://github.com/majutsushi/tagbar.git
diff --git a/by_os/Darwin/mutt/.mutt/work.rc b/by_os/Darwin/mutt/.mutt/work.rc
index a08926c..eaf8f60 100644
--- a/by_os/Darwin/mutt/.mutt/work.rc
+++ b/by_os/Darwin/mutt/.mutt/work.rc
@@ -2,7 +2,7 @@ color status            red color231
 color sidebar_divider   color231 red
 color sidebar_highlight red white
 
-set from      = "qlt@mensa.uberspace.de"
+set from      = "pks@pks.rocks"
 set sendmail  = "/Users/pks/.local/bin/msmtp -a work"
 set record    = "+work/all"
 set postponed = "+work/drafts"
diff --git a/notmuch/.notmuch-config b/by_os/Darwin/notmuch/.notmuch-config
index 3ffec33..3ffec33 100644
--- a/notmuch/.notmuch-config
+++ b/by_os/Darwin/notmuch/.notmuch-config
diff --git a/by_os/Linux/X/.xinitrc b/by_os/Linux/X/.xinitrc
index faea340..71a1180 100644
--- a/by_os/Linux/X/.xinitrc
+++ b/by_os/Linux/X/.xinitrc
@@ -1,9 +1,4 @@
-exec xmodmap ${HOME}/.Xmodmap &
-exec ${HOME}/bin/ratcpi &
-export EXT_POINTER=$(xinput list | grep "USB-HID Keyboard" | grep pointer | awk -F'=' '{print $2}' | cut -f 1)
-exec xinput set-prop $EXT_POINTER 268 2.5 &
-exec xinput set-prop $EXT_POINTER 269 1.25 &
-exec mkdir -p /tmp/mutt &
 export LC_ALL=en_US.UTF-8
+#exec setterm -blength 0
 exec ratpoison
 
diff --git a/by_os/Linux/cups/.cups/lpoptions b/by_os/Linux/cups/.cups/lpoptions
index eeb1fc7..734579c 100644
--- a/by_os/Linux/cups/.cups/lpoptions
+++ b/by_os/Linux/cups/.cups/lpoptions
@@ -1,2 +1,2 @@
-Dest home ColorModel=Gray KCEcoprint/EcoPrint=On
-Default home
+Dest iverson OKControl=Gray
+Default iverson
diff --git a/by_os/Linux/feh/.fehbg b/by_os/Linux/feh/.fehbg
index 4416428..ed4f61d 100644..100755
--- a/by_os/Linux/feh/.fehbg
+++ b/by_os/Linux/feh/.fehbg
@@ -1 +1,2 @@
-feh --no-xinerama --image-bg black --bg-center '/home/pks/images/MIPS_R3000A_die-1024x1024.jpg' 
+#!/bin/sh
+feh  --bg-fill '/home/pks/image/MIPS-R3000A-die.jpg' 
diff --git a/by_os/Linux/mutt/.mutt/work.rc b/by_os/Linux/mutt/.mutt/work.rc
index e53c0a9..3501727 100644
--- a/by_os/Linux/mutt/.mutt/work.rc
+++ b/by_os/Linux/mutt/.mutt/work.rc
@@ -3,7 +3,7 @@ color sidebar_divider   red color231
 color sidebar_highlight color201 color231
 color indicator         color231 red
 
-set from      = "qlt@mensa.uberspace.de"
+set from      = "pks@pks.rocks"
 set sendmail  = "/usr/bin/msmtp -a work"
 set record    = "+work/all"
 set postponed = "+work/drafts"
diff --git a/by_os/Linux/notmuch/.notmuch-config b/by_os/Linux/notmuch/.notmuch-config
new file mode 100644
index 0000000..6f3f736
--- /dev/null
+++ b/by_os/Linux/notmuch/.notmuch-config
@@ -0,0 +1,18 @@
+[database]
+path=/home/pks/.mail/
+
+[user]
+name=Patrick Simianer
+primary_email=p@simianer.de
+other_email=patrick@simianer.de,pks@pks.rocks,simianer@cl.uni-heidelberg.de,simianer@uni-heidelberg.de
+
+[new]
+tags=unread;inbox;
+ignore=
+
+[search]
+exclude_tags=deleted;spam;
+
+[maildir]
+synchronize_flags=true
+
diff --git a/by_os/Linux/ratpoison/.ratpoisonrc b/by_os/Linux/ratpoison/.ratpoisonrc
index f9257c5..26254f3 100644
--- a/by_os/Linux/ratpoison/.ratpoisonrc
+++ b/by_os/Linux/ratpoison/.ratpoisonrc
@@ -6,6 +6,8 @@ definekey top F14 readkey root
 bind Return exec ~/.local/bin/urxvtc --saveLines 10000
 unbind c
 bind C exec /usr/bin/firefox
+bind W exec /usr/bin/chromium
+bind E exec /usr/bin/rawtherapee
 bind D exec urxvt -fn 'xft:courier:pixelsize=16' -fg #000000 -bg #ffffff
 bind b exec ratpoison -c "echo $(~/.local/bin/battery-charge)"
 bind s hsplit
diff --git a/htop/.config/htop/htoprc b/htop/.config/htop/htoprc
index 0297d95..7f1c96c 100644
--- a/htop/.config/htop/htoprc
+++ b/htop/.config/htop/htoprc
@@ -3,11 +3,12 @@
 fields=0 48 17 18 38 39 40 2 46 47 49 1 
 sort_key=46
 sort_direction=1
-hide_threads=0
+hide_threads=1
 hide_kernel_threads=1
-hide_userland_threads=0
+hide_userland_threads=1
 shadow_other_users=0
 show_thread_names=0
+show_program_path=1
 highlight_base_name=0
 highlight_megabytes=1
 highlight_threads=0
diff --git a/tex/.texmf/tex/latex/misc/babelbst.tex b/tex/.texmf/tex/latex/misc/babelbst.tex
new file mode 100644
index 0000000..ce8a30d
--- /dev/null
+++ b/tex/.texmf/tex/latex/misc/babelbst.tex
@@ -0,0 +1,70 @@
+%%
+%% This is file `babelbst.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% merlin.mbs  (with options: `bblbst')
+%% 
+%% IMPORTANT NOTICE:
+%% 
+%% For the copyright see the source file.
+%% 
+%% Any modified versions of this file must be renamed
+%% with new filenames distinct from babelbst.tex.
+%% 
+%% For distribution of the original source see the terms
+%% for copying and modification in the file merlin.mbs.
+%% 
+%% This generated file may be distributed as long as the
+%% original source files, as listed above, are part of the
+%% same distribution. (The sources need not necessarily be
+%% in the same archive or directory.)
+%% Copyright 1994-2004 Patrick W Daly
+ % ===============================================================
+ % IMPORTANT NOTICE:
+ % This bibliographic style (bst) file has been generated from one or
+ % more master bibliographic style (mbs) files, listed above.
+ %
+ % This generated file can be redistributed and/or modified under the terms
+ % of the LaTeX Project Public License Distributed from CTAN
+ % archives in directory macros/latex/base/lppl.txt; either
+ % version 1 of the License, or any later version.
+ % ===============================================================
+ % Name and version information of the main mbs file:
+ % \ProvidesFile{merlin.mbs}[2004/02/09 4.13 (PWD, AO, DPC)]
+ % This is babelbst.tex for English.
+ % It should serve as a model for other languages.
+ % Alternatively, store it under a different name (e.g. englbst.tex)
+ % and then \input it with a command in babelbst.tex.
+\def\bbland{und}                \def\bbletal{et~al.}
+\def\bbleditors{Herausgeber}        \def\bbleds{Hg.}
+\def\bbleditor{Herausgeber}          \def\bbled{Hg.}
+\def\bbledby{herausgegeben von}
+\def\bbledition{Auf\/lage}        \def\bbledn{Aufl.}
+\def\bblvolume{Band}          \def\bblvol{Bd.}
+\def\bblof{von}
+\def\bblnumber{Nummer}          \def\bblno{Nr.}
+\def\bblin{in}
+\def\bblpages{Seiten}            \def\bblpp{S.}
+\def\bblpage{Seite}              \def\bblp{S.}
+\def\bbleidpp{Seiten}
+\def\bblchapter{Kapitel}        \def\bblchap{Kap.}
+\def\bbltechreport{Technischer Bericht}
+\def\bbltechrep{Techn.\ Ber.}
+\def\bblmthesis{Diplomarbeit}
+\def\bblphdthesis{Dissertation}
+\def\bblfirst{Erste}            \def\bblfirsto{1.}
+\def\bblsecond{Zweite}          \def\bblsecondo{2.}
+\def\bblthird{Dritte}            \def\bblthirdo{3.}
+\def\bblfourth{Vierte}          \def\bblfourtho{4.}
+\def\bblfifth{F\^^b{u}nfte}            \def\bblfiftho{5.}
+\def\bblst{.}  \def\bblnd{.}  \def\bblrd{.}
+\def\bblth{.}
+\def\bbljan{Januar}  \def\bblfeb{Februar}  \def\bblmar{M\^^b{a}rz}
+\def\bblapr{April}    \def\bblmay{Mai}       \def\bbljun{Juni}
+\def\bbljul{Juli}     \def\bblaug{August}    \def\bblsep{September}
+\def\bbloct{Oktober}  \def\bblnov{November}  \def\bbldec{Dezember}
+\endinput
+%%
+%% End of file `babelbst.tex'.
diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add
index b4322d7..44bf06f 100644
--- a/vim/.vim/spell/en.utf-8.add
+++ b/vim/.vim/spell/en.utf-8.add
@@ -125,3 +125,79 @@ discriminatively
 disfluencies
 Influentally
 WSCFG
+implementational
+asynchronicity
+NLP
+FAMT
+Yoshua
+Vauquois
+analoguosly
+unigram
+semiring
+formedness
+CYK
+NIST
+WMT
+EPO
+keyphrase
+codomain
+subgradient
+PRank
+SVM
+RankingSVM
+hypernodes
+Ngram
+Papineni
+Nakov
+Liang
+overfit
+IterMixSelSGD
+IWSLT
+Maarit
+Koponen
+FAHQMT
+MAHT
+PBMT
+Kneser
+Ney
+stopword
+truecased
+combinatorial
+LMEM
+Riezler
+Carolin
+Duy
+Katharina
+Markus
+Mayumi
+Sariya
+Sascha
+Shigehiko
+Adrià
+Gispert
+Iglesias
+Bertoldi
+Trento
+Matecat
+DFG
+OOV
+FST
+semirings
+softmax
+softmax
+Spearman
+ADAGRAD
+SampleRank
+ListNet
+ListMLE
+stopwords
+IRSTLM
+PatTR
+piecewise
+lattices
+Zipfian
+summarization
+reranker
+rerank
+Plackett
+WFST
diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl
index 5c83fc2..758f85c 100644
--- a/vim/.vim/spell/en.utf-8.add.spl
+++ b/vim/.vim/spell/en.utf-8.add.spl
diff --git a/vim/.vimrc b/vim/.vimrc
index f14b05f..9444378 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -84,3 +84,6 @@ let g:tagbar_compact = 1
 " vimwiki
 let g:vimwiki_list = [{'path':'~/wiki'}]
 
+" semantic highlighting
+let s:semanticGUIColors = [ '#72d572', '#c5e1a5', '#e6ee9c', '#fff59d', '#ffe082', '#ffcc80', '#ffab91', '#bcaaa4', '#b0bec5', '#ffa726', '#ff8a65', '#f9bdbb', '#f9bdbb', '#f8bbd0', '#e1bee7', '#d1c4e9', '#ffe0b2', '#c5cae9', '#d0d9ff', '#b3e5fc', '#b2ebf2', '#b2dfdb', '#a3e9a4', '#dcedc8' , '#f0f4c3', '#ffb74d' ]
+
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 0bd880e..9111d2b 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -37,6 +37,11 @@ if [[ -d ~/nlp_scripts ]]; then
   export PATH=~/nlp_scripts:$PATH
 fi
 
+which R &>/dev/null
+if [[ $? == 0 ]]; then
+  export R_LIBS_USER=$HOME/.R
+fi
+
 export EDITOR='vim -p'
 
 export LC_ALL=en_US.UTF-8
@@ -102,7 +107,7 @@ in_google_cloud () {
 
 # possible colors: black, white, green, cyan, red, yellow, magenta
 case `hostname` in
-  bogues*|curry*|iverson*|jordan*|ming*|nowitzki*|oneal*|robinson*)
+  bryant|barkley|bogues*|curry*|durant*|iverson*|jordan*|ming*|nowitzki*|oneal*|robinson*)
     HOSTCOLOR_BG=magenta
     HOSTCOLOR_FG=black
   ;;
@@ -168,7 +173,7 @@ case `hostname` in
     umask u=rwx,g=rwx,o=rx
     alias tmux="tmux -f ~/.tmux.`hostname`.conf"
   ;;
-  bogues|curry|iverson|nowitzki|oneal|ming|*.uberspace.de)
+  bryant|barkley|bogues|curry|durant|iverson|nowitzki|oneal|ming|*.uberspace.de)
     PATH=/usr/lib/colorgcc/bin:$PATH
   ;;
 esac