Fix merge

home/shell_aliases

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 alias cat='bat'
 alias cprm='git remote get-url origin | tr -d "\n" | pbcopy'
 alias dcomp="docker compose"
@@ -10,6 +8,7 @@ alias g='git'
 alias gcd='cd $(git rev-parse --show-toplevel)'
 alias gp='git push -u'
 alias ls="eza -lhgxUm --git --time-style long-iso --group-directories-first"
+alias lzd='lazydocker'
 alias tree=tree -I 'node_modules|venv'
 alias vim=nvim
 alias vimini="vim ~/.config/nvim/init.vim"

home/shell_base

@@ -1,17 +1,8 @@
 source ~/.shell_funcs
 source ~/.shell_aliases
+source ~/.shell_exports
 
-export PYENV_ROOT="$HOME/.pyenv"
 command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
+
 eval "$(pyenv init -)"
-
-export WORKON_HOME=~/rl/_envs/
-
-export PATH=/Users/tyrel/bin/:$PATH
 eval "$(direnv hook zsh)"
-export GPG_TTY=$(tty)
-
-export ANDROID_NDK_HOME="$HOMEBREW_PREFIX/share/android-ndk"
-
-alias lzd='lazydocker'
-export BAT_THEME="Dracula"

home/shell_exports

@@ -0,0 +1,13 @@
+export ANDROID_NDK_HOME="$HOMEBREW_PREFIX/share/android-ndk"
+export BAT_THEME="Dracula"
+export EDITOR=nvim
+export GPG_TTY=$(tty)
+export PYENV_ROOT="$HOME/.pyenv"
+export VISUAL=nvim
+export WORKON_HOME=~/rl/_envs/
+
+
+
+
+# KEEP LAST
+export PATH=/Users/tyrel/bin/:$PATH

home/shell_funcs

@@ -1,6 +1,4 @@
 #!/bin/bash
-export EDITOR=nvim
-export VISUAL=nvim
 
 # Functions
 function httpdiff () {

justfile

@@ -35,6 +35,7 @@ reset-symlinks:
   rm /home/{{USER}}/.p10k.zsh
   rm /home/{{USER}}/.shell_aliases
   rm /home/{{USER}}/.shell_funcs
+  rm /home/{{USER}}/.shell_exports
 
 symlinks:
   ln -s {{PWD}}/home/gitconfig /home/{{USER}}/.gitconfig
@@ -42,6 +43,7 @@ symlinks:
   ln -s {{PWD}}/home/p10k.zsh /home/{{USER}}/.p10k.zsh
   ln -s {{PWD}}/home/shell_aliases /home/{{USER}}/.shell_aliases
   ln -s {{PWD}}/home/shell_funcs /home/{{USER}}/.shell_funcs
+  ln -s {{PWD}}/home/shell_exports /home/{{USER}}/.shell_exports
   ln -s {{PWD}}/home/bin /home/{{USER}}
   ln -s {{PWD}}/home/config/nvim /home/{{USER}}/.config/
   echo "source ~/.shell_base" >> ~/.bashrc