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

8 files changed, 45 insertions, 11 deletions

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/by_os/Darwin/notmuch/.notmuch-config b/by_os/Darwin/notmuch/.notmuch-config
new file mode 100644
index 0000000..3ffec33
--- /dev/null
+++ b/by_os/Darwin/notmuch/.notmuch-config
@@ -0,0 +1,18 @@
+[database]
+path=/Users/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/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