From 4ce162f0f92d1f71b1489a5a7b82489b247809af Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 12 Sep 2024 02:41:25 -0700 Subject: [PATCH 1/3] env: use path_append --- .config/shell/env | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.config/shell/env b/.config/shell/env index a2ee892..cc4d6d6 100644 --- a/.config/shell/env +++ b/.config/shell/env @@ -98,7 +98,7 @@ export ZLE_RPROMPT_INDENT=0 export ZINIT_HOME_DIR="$DATA_HOME/zinit" # Add cargo to PATH if it exists -[ -d "$HOME/.cargo/bin" ] && export PATH="$PATH:$HOME/.cargo/bin" +path_append "$HOME/.cargo/bin" # Set documents directory (auto set to the repo the file ~/todo points to is in) if [ -h ~/todo ] && command -v git > /dev/null; then @@ -157,12 +157,4 @@ DPC="$DP/classes" export S SS # this makes it easier to load the shrc while in posix sh -# wine things (TODO: REMOVE WHEN NOT NEEDED) -if test -d "$HOME/.local/share/bottles/bottles/east-west-composers"; then - WINEPREFIX="$HOME/.local/share/bottles/bottles/east-west-composers" -fi -if test -d "$HOME/.local/share/bottles/runners/wine-ge-proton8-21/bin"; then - PATH="$HOME/.local/share/bottles/runners/wine-ge-proton8-21/bin:$PATH" -fi - # vim:fdm=marker:fmr=>>>,<<<:et:ft=sh:sw=3:ts=3 From d60dc6c740ded766188b6add904c648ce4c0b21b Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 12 Sep 2024 02:43:41 -0700 Subject: [PATCH 2/3] add .gitkeep to local env folder --- .config/shell/local/.gitkeep | 0 .config/shell/local/env | 4 ---- 2 files changed, 4 deletions(-) create mode 100644 .config/shell/local/.gitkeep delete mode 100644 .config/shell/local/env diff --git a/.config/shell/local/.gitkeep b/.config/shell/local/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/.config/shell/local/env b/.config/shell/local/env deleted file mode 100644 index 8129a59..0000000 --- a/.config/shell/local/env +++ /dev/null @@ -1,4 +0,0 @@ -export REPOS_TO_UPDATE="/home/blake/Documents/pwp" -export PATH="$HOME/.local/share/bottles/runners/wine-ge-proton8-14/bin:$PATH" - -# vim:ft=bash From 0f348e586f847f60224dfbe8aa9437dc86b80b75 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 12 Sep 2024 02:46:50 -0700 Subject: [PATCH 3/3] profile: don't set local bin folder --- .profile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.profile b/.profile index 0e68392..780fc7c 100644 --- a/.profile +++ b/.profile @@ -7,11 +7,6 @@ export SHELL_CONFIG_DIR="${SHELL_CONFIG_DIR:-"${XDG_CONFIG_HOME:-"$HOME/.config" . "$SHELL_CONFIG_DIR/env" -# set PATH so it includes user's private bin if it exists -if [ -d "$HOME/.local/bin" ] ; then - PATH="$HOME/.local/bin:$PATH" -fi - # Locales export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8