From f1c774c0cd3647c266d120e02906a234679856fd Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Tue, 18 Oct 2022 19:28:31 +0200
Subject: [PATCH] Add Opam path and refactor path organization

---
 arch.sh     | 9 ++++++---
 arch_wsl.sh | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/arch.sh b/arch.sh
index 8837738..c22cf0e 100644
--- a/arch.sh
+++ b/arch.sh
@@ -156,8 +156,9 @@ then
     curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
     source "$HOME"/.cargo/env
     # Dev tools
-    rustup component add rust-analysis
-    rustup component add rls
+    rustup component add rust-analysis rls
+    # Add Cargo packages from Rust
+    fish -c "fish_add_path $HOME/.cargo/bin"
 
     # === tldr ==
     cargo install tealdeer
@@ -361,7 +362,7 @@ then
     git config --global pull.rebase true
     git config --global init.defaultBranch main
 
-    # === Path ==
+    # === Python ==
     # Add PIP packages from Python to the path
     fish -c "fish_add_path /home/anri/.local/bin"
 
@@ -371,6 +372,8 @@ then
     yes | opam init
     opam install -y utop ocaml-lsp-server ocamlformat ocamlformat-rpc
     wget -q https://git.kennel.ml/Anri/confOS/raw/branch/main/dotfiles/.ocamlformat -O "$HOME"/.ocamlformat
+    # Add Opam packages from OCaml
+    fish -c "fish_add_path /home/anri/.opam/default/bin"
 
     # === Clang ==
     wget -q https://git.kennel.ml/Anri/confOS/raw/branch/main/dotfiles/.clang-format -O "$HOME"/.clang-format
diff --git a/arch_wsl.sh b/arch_wsl.sh
index 202310c..9e3fce7 100644
--- a/arch_wsl.sh
+++ b/arch_wsl.sh
@@ -40,6 +40,8 @@ then
     source "$HOME"/.cargo/env
     # Dev tools
     rustup component add rust-analysis rls
+    # Add Cargo packages from Rust
+    fish -c "fish_add_path $HOME/.cargo/bin"
 
     # === Set-up systemd
     mkdir subsystemctl
@@ -188,11 +190,9 @@ then
     git config --global pull.rebase true
     git config --global init.defaultBranch main
 
-    # === Path ==
+    # === Python ==
     # Add PIP packages from Python
     fish -c "fish_add_path $HOME/.local/bin"
-    # Add Cargo packages from Rust
-    fish -c "fish_add_path $HOME/.cargo/bin"
 
     # === OCaml ==
     # Init Opam and install stuff
@@ -200,6 +200,8 @@ then
     yes | opam init
     opam install -y utop ocaml-lsp-server ocamlformat ocamlformat-rpc
     wget -q https://git.kennel.ml/Anri/confOS/raw/branch/main/dotfiles/.ocamlformat -O "$HOME"/.ocamlformat
+    # Add Opam packages from OCaml
+    fish -c "fish_add_path /home/anri/.opam/default/bin"
 
     # === Clang ==
     wget -q https://git.kennel.ml/Anri/confOS/raw/branch/main/dotfiles/.clang-format -O "$HOME"/.clang-format