From 6b9a2dffbde41ce577b7ecc91d1effc005ac3224 Mon Sep 17 00:00:00 2001
From: Galen Guyer <galen@galenguyer.com>
Date: Mon, 13 Feb 2023 12:44:55 -0500
Subject: some zshrc cleanup

---
 modules/20-zsh/zshrc | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/20-zsh/zshrc b/modules/20-zsh/zshrc
index 9bfe051..d582e61 100644
--- a/modules/20-zsh/zshrc
+++ b/modules/20-zsh/zshrc
@@ -128,8 +128,10 @@ export EDITOR=nano
 
 ## path fixes
 # cargo (rust)
-if [[ -d "$HOME/.cargo/bin" ]]; then
+if [[ -d "$HOME/.cargo" ]]; then
   export PATH="$HOME/.cargo/bin:$PATH"
+  export CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse"
+  export CARGO_TARGET_DIR="$HOME/.cargo/targets"
 fi
 
 # acme.sh
@@ -148,10 +150,14 @@ if [[ -d "/opt/asdf-vm/" ]]; then
 fi
 
 # esp32-rs
-if [[ -d "$HOME/.espressif" ]]; then
-  export LIBCLANG_PATH="/home/chef/.espressif/tools/xtensa-esp32-elf-clang/esp-14.0.0-20220415-x86_64-unknown-linux-gnu/lib/"
-  export PATH="/home/chef/.espressif/tools/xtensa-esp32-elf-gcc/8_4_0-esp-2021r2-patch3-x86_64-unknown-linux-gnu/bin/:/home/chef/.espressif/tools/xtensa-esp32s2-elf-gcc/8_4_0-esp-2021r2-patch3-x86_64-unknown-linux-gnu/bin/:/home/chef/.espressif/tools/xtensa-esp32s3-elf-gcc/8_4_0-esp-2021r2-patch3-x86_64-unknown-linux-gnu/bin/:$PATH"
-  export PIP_USER="no"
+#if [[ -d "$HOME/.espressif" ]]; then
+#  export LIBCLANG_PATH="/home/chef/.espressif/tools/xtensa-esp32-elf-clang/esp-14.0.0-20220415-x86_64-unknown-linux-gnu/lib/"
+#  export PATH="/home/chef/.espressif/tools/xtensa-esp32-elf-gcc/8_4_0-esp-2021r2-patch3-x86_64-unknown-linux-gnu/bin/:/home/chef/.espressif/tools/xtensa-esp32s2-elf-gcc/8_4_0-esp-2021r2-patch3-x86_64-unknown-linux-gnu/bin/:/home/chef/.espressif/tools/xtensa-esp32s3-elf-gcc/8_4_0-esp-2021r2-patch3-x86_64-unknown-linux-gnu/bin/:$PATH"
+#  export PIP_USER="no"
+#fi
+
+if [[ -d "$HOME/.bin" ]]; then
+  export PATH="$HOME/.bin:$PATH"
 fi
 
 if [[ -z "$SSH_AUTH_SOCK" ]]; then
@@ -165,12 +171,17 @@ fi
 export RG_PATH="${RG_PATH:-$(which rg)}"
 function rg() {
     if [[ -t 1 ]]; then
-        $RG_PATH -p "$@" | less -RFX
+        $RG_PATH -p "$@" | less --RAW-CONTROL-CHARS --quit-if-one-screen --no-init
     else
 	$RG_PATH "$@"
     fi
 }
 
+if [[ -d "$HOME/.local/share/pnpm" ]]; then
+    export PNPM_HOME="$HOME/.local/share/pnpm"
+    export PATH="$PNPM_HOME:$PATH"
+fi
+
 func bottom() {
 	cat /dev/urandom | env LC_CTYPE=C tr -dc "asdfghjkl;" | fold -w 20 | head -n 1
 }
-- 
cgit v1.2.3