Merge branch 'main' of git.mylloon.fr:Anri/confOS

arch.sh

@@ -16,8 +16,12 @@ main() {
   local repo
   repo=https://git.mylloon.fr/Anri/confOS/raw/branch/main
 
-  # === Remove extra packages ==
+  # === Pacman configuration ==
   pacman -D --asexplicit archlinux-keyring # keep this package
+  sudo sed -i "s/#Color/Color/g" /etc/pacman.conf
+  sudo sed -i "s/#ParallelDownloads = 5/ParallelDownloads = 3/g" /etc/pacman.conf
+
+  # === Remove extra packages ==
   sudo pacman -Rsn --noconfirm \
     epiphany gnome-maps cheese gnome-weather gnome-music gnome-books vim \
   # gnome-firefox, maps, caméra, météo,      musique, liseuse, vim
@@ -32,10 +36,6 @@ main() {
   # Dev tools
   rustup component add rust-analysis rls
 
-  # === Colors package manager ==
-  sudo sed -i "s/#Color/Color/g" /etc/pacman.conf
-  sudo sed -i "s/#ParallelDownloads = 5/ParallelDownloads = 3/g" /etc/pacman.conf
-
   # === Paru ==
   git clone https://aur.archlinux.org/paru.git
   cd paru || exit
@@ -94,6 +94,7 @@ main() {
   curl -s ${repo}/.config/fish/conf.d/abbr_arch.fish >> "$HOME"/.config/fish/conf.d/abbr.fish
   # Add aliases
   wget -q ${repo}/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish
+  curl -s ${repo}/.config/fish/conf.d/alias_arch.fish >> "$HOME"/.config/fish/conf.d/alias.fish
 
   # Themes in Gnome Terminal, the default one will be the dark one
   local GT_default
@@ -127,30 +128,29 @@ main() {
   wget -q --show-progress ${repo}/.config/micro/settings.json -O "$HOME"/.config/micro/settings.json
   micro -plugin install detectindent
 
-  # === GL4D ==
-  # Download, build and installation
-  git clone https://github.com/noalien/GL4Dummies.git
-  cd GL4Dummies || exit
-  make -f Makefile.autotools
-  ./configure
-  make
-  sudo make install
-  cd ..
-  rm -rf GL4Dummies ||:
-  # Fix for shared libraries (https://stackoverflow.com/a/9395355)
-  sudo ldconfig
-  # Add to path
-  fish -c "set -Ua LD_LIBRARY_PATH /usr/local/lib"
+  # # === GL4D ==
+  # # Download, build and installation
+  # git clone https://github.com/noalien/GL4Dummies.git
+  # cd GL4Dummies || exit
+  # make -f Makefile.autotools
+  # ./configure
+  # make
+  # sudo make install
+  # cd ..
+  # rm -rf GL4Dummies ||:
+  # # Fix for shared libraries (https://stackoverflow.com/a/9395355)
+  # sudo ldconfig
+  # # Add to path
+  # fish -c "set -Ua LD_LIBRARY_PATH /usr/local/lib"
 
   # === Rust ==
   # Add Cargo packages from Rust
   mkdir -p "$HOME"/.cargo/bin
   fish -c "fish_add_path $HOME/.cargo/bin ||:"
-  # Add cargo packages
-  cargo install cargo-update cargo-cache
+  # Install cargo packages
+  cargo install cargo-update cargo-cache tealdeer
 
   # === tldr ==
-  cargo install tealdeer
   fish -c "tldr --update"
   # Fish completion
   local url_tldr

arch_wsl.sh

@@ -119,6 +119,7 @@ main() {
   curl -s ${repo}/.config/fish/conf.d/abbr_wsl.fish >> "$HOME"/.config/fish/conf.d/abbr.fish
   # Add aliases
   wget -q ${repo}/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish
+  curl -s ${repo}/.config/fish/conf.d/alias_wsl.fish >> "$HOME"/.config/fish/conf.d/alias.fish
 
   # === Default editor ==
   fish -c "set -Ux EDITOR nano"
@@ -128,20 +129,20 @@ main() {
   wget -q --show-progress ${repo}/.config/micro/settings.json -O "$HOME"/.config/micro/settings.json
   micro -plugin install detectindent
 
-  # === GL4D ==
-  # Download, build and installation
-  git clone https://github.com/noalien/GL4Dummies.git
-  cd GL4Dummies || exit
-  make -f Makefile.autotools
-  ./configure
-  make
-  sudo make install
-  cd ..
-  rm -rf GL4Dummies ||:
-  # Fix for shared libraries (https://stackoverflow.com/a/9395355)
-  sudo ldconfig
-  # Add to path
-  fish -c "set -Uax LD_LIBRARY_PATH /usr/local/lib"
+  # # === GL4D ==
+  # # Download, build and installation
+  # git clone https://github.com/noalien/GL4Dummies.git
+  # cd GL4Dummies || exit
+  # make -f Makefile.autotools
+  # ./configure
+  # make
+  # sudo make install
+  # cd ..
+  # rm -rf GL4Dummies ||:
+  # # Fix for shared libraries (https://stackoverflow.com/a/9395355)
+  # sudo ldconfig
+  # # Add to path
+  # fish -c "set -Uax LD_LIBRARY_PATH /usr/local/lib"
 
   # === tldr ==
   cargo install tealdeer