merge w/ barkley's version

9 files changed, 25 insertions, 20 deletions

diff --git a/by_os/Linux/X/.Xdefaults b/by_os/Linux/X/.Xdefaults
index 7572abd..ca27504 100644
--- a/by_os/Linux/X/.Xdefaults
+++ b/by_os/Linux/X/.Xdefaults
@@ -27,6 +27,9 @@ Xft.hinting: true
 Xft.hintstyle: hintslight
 URxvt*font:     xft:Misc Tamsyn:pixelsize=16:style=regular:antialias=false,xft:Inconsolata Powerline:pixelsize=16
 URxvt*boldFont: xft:Misc Tamsyn:pixelsize=17:style=bold:antialias=false,xft:Inconsolata Powerline:pixelsize=16
+/*for barkley:
+URxvt*font:     xft:Monaco for Powerline:pixelsize=22:style=Regular:antialias=true
+URxvt*boldFont: xft:Monaco for Powerline:pixelsize=22:style=Bold:antialias=true*/
 
 /* change default colors */
 URxvt*background: #000000
diff --git a/by_os/Linux/X/.xinitrc b/by_os/Linux/X/.xinitrc
index 078cb2a..71a1180 100644
--- a/by_os/Linux/X/.xinitrc
+++ b/by_os/Linux/X/.xinitrc
@@ -1,15 +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)
-if [[ $(hostname) == "kobe" ]]; then
-  exec xinput set-prop $EXT_POINTER 264 2.5 &
-  exec xinput set-prop $EXT_POINTER 265 1.0 &
-  exec xinput set-prop $EXT_POINTER 266 5.0 &
-elif [[ $(hostname) == "bogues" ]]; then
-  exec xinput set-prop $EXT_POINTER 268 2.5 &
-  exec xinput set-prop $EXT_POINTER 269 1.25 &
-fi
-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/ratpoison/.ratpoisonrc b/by_os/Linux/ratpoison/.ratpoisonrc
index 748fe8a..4f8d30b 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 ~/.local/bin/browser
+# for barkley: GDK_DPI_SCALE=1.5 /usr/bin/chromium
+bind W exec /usr/bin/chromium
 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 d0ff8ef..7f1c96c 100644
--- a/htop/.config/htop/htoprc
+++ b/htop/.config/htop/htoprc
@@ -3,9 +3,9 @@
 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
diff --git a/mozilla/.mozilla/firefox/pks.default/chrome/userChrome.css b/mozilla/.mozilla/firefox/pks.default/chrome/userChrome.css
index fd60432..93851bd 100644
--- a/mozilla/.mozilla/firefox/pks.default/chrome/userChrome.css
+++ b/mozilla/.mozilla/firefox/pks.default/chrome/userChrome.css
@@ -44,3 +44,8 @@ width: 100%;
 #tabbrowser-tabs { width: 100%; }
 #content-deck { margin-bottom: 0em; }
 
+/* mve Find Bar above the page */
+.browserContainer > findbar {
+  -moz-box-ordinal-group: 0;
+}
+
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