pinentry: switch to x11 as gtk-2 is dead

[home.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 26ac1129f6f5e07784a664f8468ef0d2047866ff..1c7a08bc017e319972133f0610462113e2739099 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -25,7 +25,7 @@ unset LDPATH # KDE bs
 shopt -s checkwinsize
 shopt -s no_empty_cmd_completion
 
-eval `dircolors 2>/dev/null`
+[ "${LS_COLORS:+set}" = "set" ] || eval "$(dircolors 2>/dev/null)"
 
 [ -r /usr/local/src/blackfin/bin/bfin-alias ] && . /usr/local/src/blackfin/bin/bfin-alias
 [ -r /usr/local/src/blackfin/git/toolchain/distribution/snapshots/bfin-alias ] && . /usr/local/src/blackfin/git/toolchain/distribution/snapshots/bfin-alias
@@ -35,4 +35,5 @@ eval `dircolors 2>/dev/null`
 export GTK2_RC_FILES="$HOME/.gtkrc-2.0:$HOME/.kde/share/config/gtkrc-2.0:/etc/gtk-2.0/gtkrc"
 
 ulimit -c $(( 512 * 1024 )) # units of KiB
-ulimit -u $(( 500 * $(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) ))
+# Chrome creates a shit ton of procs/threads now.
+ulimit -u $(( 1000 * $(getconf _NPROCESSORS_CONF 2>/dev/null || echo 1) )) 2>/dev/null