set powerlevel10k gitstatus thread number, e5-specific updates

zlogin

@@ -7,6 +7,9 @@ export PAGER='less'
 export HISTFILE=$HOME/.zhistory
 export HISTSIZE=20000
 
+# use less threads to populate git status
+export GITSTATUS_NUM_THREADS=2
+
 if [[ -z "$LANG" ]]; then
   export LANG='en_US.UTF-8'
 fi

zsh_local_e5

@@ -8,23 +8,18 @@ export LIBCLANG_PATH=/cvmfs/sft.cern.ch/lcg/releases/clang/8.0.0-ed577/x86_64-ce
 export CLANG_HEADER=/cvmfs/sft.cern.ch/lcg/releases/clang/8.0.0-ed577/x86_64-centos7/lib/clang/8.0.0/include/
 
 alias set_conda="source /usr/scripts/set_conda.sh && source ~/.set_conda_local"
-alias rf="set_conda && conda activate root_forge"
-alias ipy="set_conda && conda activate root_forge_36 && ipython"
 
-export CONDOR_LOGS=/ceph/users/kheinicke/condor_logs
-export D=/ceph/users/kheinicke/b2oc/dsk-run2
+function ipy () {
+    if ! which ipython &> /dev/null; then
+        set_conda
+        conda activate root_forge
+    fi
+    ipython
+}
 
-function batchmake () {
-    mkdir -p $CONDOR_LOGS/{stderr,log,stdout}
-    snakemake --cores 10000 --local-cores 64 --latency-wait 1 \
-        --max-jobs-per-second 32 --max-status-checks-per-second 512 \
-        --drmaa \
-" getenv = True "$'\n'\
-" request_cpus = {threads}"$'\n'\
-" output = $CONDOR_LOGS/stdout/{rule}.{wildcards}.out"$'\n'\
-" error = $CONDOR_LOGS/stderr/{rule}.{wildcards}.err"$'\n'\
-" logs = $CONDOR_LOGS/log/{rule}.{wildcards}.log "$'\n'\
-" request_memory = 8G "$'\n'\
-" +MaxRunHours = ${MAXRUNHOURS:-24} " \
-${*} | sed -u "s/DEBUG: Sleeping for a moment/./"
+function rf () {
+    if ! which conda &> /dev/null; then
+        set_conda
+    fi
+    conda activate root_forge
 }