From 6ce7200739ced9ad0d115a0a7a8e084cedeeec2d Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Thu, 3 Nov 2022 12:12:40 +0100
Subject: [PATCH] [Fish, Profile] Move custom paths to .profile

---
 .profile            | 10 ++++++++--
 org/config/fish.org | 42 ------------------------------------------
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/.profile b/.profile
index 1ea2fb1..afade6a 100644
--- a/.profile
+++ b/.profile
@@ -3,8 +3,6 @@ export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_STATE_HOME="$HOME/.local/state"
 
-
-export PATH="$HOME/.cargo/bin:$PATH"
 export EMAIL="lucien@phundrak.com"
 export NAME="Lucien Cartier-Tilet"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
@@ -74,3 +72,11 @@ export QSYS_ROOTDIR="/home/phundrak/.cache/paru/clone/quartus-free/pkg/quartus-f
 export XMODIFIERS=
 
 alias wget="wget --hsts-file${XDG_DATA_HOME}/wget-hsts"
+PATH="/usr/lib/xfce-polkit/:$PATH"
+PATH="$HOME/.cabal/bin:$PATH"
+PATH="$GEM_HOME/ruby/2.6.0/bin:$PATH"
+PATH="$GEM_HOME/ruby/2.6.0/bin:$PATH"
+PATH="$GOPATH/bin:$PATH"
+PATH="${CARGO_HOME}/bin:$PATH"
+PATH="$HOME/.local/bin:$PATH"
+export PATH
diff --git a/org/config/fish.org b/org/config/fish.org
index 3059fc1..661cf66 100644
--- a/org/config/fish.org
+++ b/org/config/fish.org
@@ -63,48 +63,6 @@ let’s do so.
 set -gx PKG_CONFIG_PATH /usr/local/lib/pkgconfig/ $PKG_CONFIG_PATH
 #+END_SRC
 
-** ~$PATH~
-:PROPERTIES:
-:CUSTOM_ID: Global_variables-$PATH-e1320303
-:END:
-A variable available with the fish shell is ~fish_user_paths~ which lists custom
-paths to binaries specified by the user. Using this variable ensures they are
-included in the ~$PATH~ variable only once without the need to set it directly.
-For instance, my ~PATH~ variable needs Rust’s Cargo’s binaries, Go’s binaries,
-my own executables, and some more.
-
-#+NAME: extra-paths
-| additional path          | what it leads to                                  |
-|--------------------------+---------------------------------------------------|
-| $HOME/.local/bin         | Custom executables, see [[file:bin.org]]              |
-| $GOPATH/bin              | Go binaries and executables                       |
-| $CARGO_HOME/bin          | Rust binaries and executables                     |
-| $GEM_HOME/ruby/3.0.0/bin | Ruby 3.0 binaries and executables                 |
-| $GEM_HOME/ruby/2.6.0/bin | Ruby 2.6 binaries and executables                 |
-| $HOME/.cabal/bin         | Haskel binaries                                   |
-| /usr/lib/xfce-polkit     | Path to XFCE’s PolKit                             |
-
-#+NAME: generate-extra-paths
-#+BEGIN_SRC emacs-lisp :var paths=extra-paths[,0] :exports none :cache yes
-(mapconcat #'identity
-           paths " \\\n")
-#+END_SRC
-
-#+RESULTS[8fe70e73420376a50897de0f9518689ec3088288]: generate-extra-paths
-: $HOME/.local/bin \
-: $GOPATH/bin \
-: $CARGO_HOME/bin \
-: $GEM_HOME/ruby/3.0.0/bin \
-: $GEM_HOME/ruby/2.6.0/bin \
-: $HOME/.cabal/bin \
-: /usr/lib/xfce-polkit
-
-So, let’s set our user paths:
-#+BEGIN_SRC fish :noweb yes
-set -g fish_user_paths \
-<<generate-extra-paths()>>
-#+END_SRC
-
 * Tramp remote access
 :PROPERTIES:
 :CUSTOM_ID: Tramp_remote_access-72aedec2