From 5ae1f57c3353f8b70ce3291dbe97b461b6c93642 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 15 Nov 2023 09:58:58 +0100 Subject: [PATCH 1/4] download custom aliases --- arch.sh | 1 + arch_wsl.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/arch.sh b/arch.sh index 799fb32..e653f40 100644 --- a/arch.sh +++ b/arch.sh @@ -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 diff --git a/arch_wsl.sh b/arch_wsl.sh index a9e1a78..93645b4 100644 --- a/arch_wsl.sh +++ b/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" From f912f9ac287ffc0db57847d28d8aeef65ce99c90 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 15 Nov 2023 09:59:15 +0100 Subject: [PATCH 2/4] don't install gl4d anymore --- arch.sh | 28 ++++++++++++++-------------- arch_wsl.sh | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/arch.sh b/arch.sh index e653f40..1ed28e6 100644 --- a/arch.sh +++ b/arch.sh @@ -128,20 +128,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 -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 diff --git a/arch_wsl.sh b/arch_wsl.sh index 93645b4..ef7ab1f 100644 --- a/arch_wsl.sh +++ b/arch_wsl.sh @@ -129,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 From 86220064c6c745141d54c6023c7240e150dde6af Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 15 Nov 2023 09:59:24 +0100 Subject: [PATCH 3/4] group pacman configuration --- arch.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch.sh b/arch.sh index 1ed28e6..f33bf59 100644 --- a/arch.sh +++ b/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 From 65809c066e3a435df4ecbde308315ae93aa4a671 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 15 Nov 2023 10:00:42 +0100 Subject: [PATCH 4/4] refactor cargo installations --- arch.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch.sh b/arch.sh index f33bf59..c562f16 100644 --- a/arch.sh +++ b/arch.sh @@ -147,11 +147,10 @@ main() { # 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