From 8066647b1106294662a7875d66221a577f3ecc68 Mon Sep 17 00:00:00 2001
From: John Mertz <git@john.me.tz>
Date: Tue, 27 Jun 2023 20:27:23 -0400
Subject: [PATCH] Update paths for Nix, Flatpak and others

---
 bash/bashrc    |  3 ---
 bash/path      | 26 ++++++++++++++++----------
 bash/path.host |  4 ++++
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/bash/bashrc b/bash/bashrc
index 7f7f45233..bfddaa45e 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -63,9 +63,6 @@ if [ -f ${HOME}/.dotfiles/bash/bash_aliases ]; then
     . "${HOME}/.dotfiles/bash/bash_aliases"
 fi
 
-# Add snaps and flatpaks to path
-#export XDG_DATA_DIRS="$XDG_DATA_DIRS:/usr/local/share:/usr/share:/var/lib/snapd/desktop:/var/lib/flatpak/exports/share"
-
 # Perl configs
 PERL5LIB="${HOME}/perl5/lib/perl5:${HOME}/perl5/lib/perl5/x86_64-linux-thread-multi:${PERL5LIB}"; export PERL5LIB;
 PERL_LOCAL_LIB_ROOT="${HOME}/perl5/lib/perl5:${HOME}/perl5/lib/perl5/x86_64-linux-thread-multi:${PERL_LOCAL_LIB_ROOT}"; export PERL_LOCAL_LIB_ROOT;
diff --git a/bash/path b/bash/path
index e1ba5ed40..34b9c72fc 100644
--- a/bash/path
+++ b/bash/path
@@ -4,11 +4,19 @@
 if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
+
 if [ -d "$HOME/.local/bin" ] ; then
-    PATH="$HOME/.local/bin:$HOME/.local/bin/firefox:$PATH"
+    PATH="$HOME/.local/bin::$PATH"
+    #PATH="$HOME/.local/bin:$HOME/.local/bin/firefox:$PATH"
 fi
-if [ -d "$HOME/.local/share/applications" ] ; then
-    export PATH="$HOME/.local/share/applications/:$PATH"
+
+#if [ -d "$HOME/.local/share/applications" ] ; then
+    #export PATH="$HOME/.local/share/applications/:$PATH"
+#fi
+
+# Nix Packages
+if [ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
+    source $HOME/.nix-profile/etc/profile.d/nix.sh
 fi
 
 # Private scripts
@@ -21,8 +29,9 @@ if [ -d "$HOME/scripts" ] ; then
     PATH="$HOME/scripts:$PATH"
 fi
 
-# Flutter
-PATH="$HOME/flutter/bin/:$PATH"
+# Perl
+PATH="${HOME}/perl5/bin:$PATH"
+
 # Python
 export PYENV_ROOT="$HOME/.pyenv"
 PATH="$PYENV_ROOT/bin:$PATH"
@@ -30,8 +39,8 @@ if command -v pyenv 1>/dev/null 2>&1; then
   eval "$(pyenv init -)"
 fi
 
-# Perl
-PATH="${HOME}/perl5/bin:$PATH"
+# Rust
+PATH="${HOME}/.cargo/bin:$PATH"
 
 if [ -f "/run/.containerenv" ]; then
     source "$HOME/.dotfiles/bash/path.distrobox"
@@ -39,8 +48,5 @@ else
     source "$HOME/.dotfiles/bash/path.host"
 fi
 
-# Rust
-PATH="${HOME}/.cargo/bin:$PATH"
-
 # Export PATH
 export PATH="$PATH"
diff --git a/bash/path.host b/bash/path.host
index 11ec60ea5..37bd12da3 100644
--- a/bash/path.host
+++ b/bash/path.host
@@ -1,5 +1,9 @@
 # vim: ft=sh
 
+# Add snaps and flatpaks to path
+export XDG_DATA_DIRS="$XDG_DATA_DIRS:/usr/local/share:/usr/share:/var/lib/snapd/desktop:/var/lib/flatpak/exports/share"
+
+# Add distrobox exports
 for i in $(find $HOME/scripts/distrobox -maxdepth 1); do
     if [ -d "$i" ]; then
         PATH="$i:$PATH"