From f403e1cd5f5e2c54c1011cc64500ffb5bc24cf31 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Wed, 13 Sep 2023 22:37:04 +0200 Subject: [PATCH] use repo alias --- arch.sh | 40 ++++++++++++++++++++++------------------ arch_wsl.sh | 28 ++++++++++++++++------------ 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/arch.sh b/arch.sh index c94f08b..d629a60 100644 --- a/arch.sh +++ b/arch.sh @@ -12,6 +12,10 @@ fi cd "$(dirname "$0")" # change script directory main() { + # Variables + local repo + repo=https://git.mylloon.fr/Anri/confOS/raw/branch/main + # === Remove extra packages == pacman -D --asexplicit archlinux-keyring # keep this package sudo pacman -Rsn --noconfirm \ @@ -81,24 +85,24 @@ main() { wget -q https://gitlab.com/kyb/fish_ssh_agent/raw/master/functions/fish_ssh_agent.fish -P "$HOME"/.config/fish/functions/ mkdir "$HOME"/.ssh # Custom config.fish - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/config_arch.fish -O "$HOME"/.config/fish/config.fish + wget -q ${repo}/.config/fish/config_arch.fish -O "$HOME"/.config/fish/config.fish # Fish theme fish -c "fish_config theme choose 'Base16 Eighties' && yes | fish_config theme save" # Fish prompt rm "$HOME"/.config/fish/functions/fish_prompt.fish 2> /dev/null - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/functions/fish_prompt.fish -P "$HOME"/.config/fish/functions/ + wget -q ${repo}/.config/fish/functions/fish_prompt.fish -P "$HOME"/.config/fish/functions/ # EZA colors fish -c "set -Ux EXA_COLORS 'di=1;36:da=35'" # Add abbreviations - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/conf.d/abbr.fish -O "$HOME"/.config/fish/conf.d/abbr.fish - curl -s https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/conf.d/abbr_arch.fish >> "$HOME"/.config/fish/conf.d/abbr.fish + wget -q ${repo}/.config/fish/conf.d/abbr.fish -O "$HOME"/.config/fish/conf.d/abbr.fish + curl -s ${repo}/.config/fish/conf.d/abbr_arch.fish >> "$HOME"/.config/fish/conf.d/abbr.fish # Add aliases - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish + wget -q ${repo}/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish # Themes in Gnome Terminal, the default one will be the dark one local GT_default GT_default=$(gsettings get org.gnome.Terminal.ProfilesList default | tr -d \') - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/update_theme.sh -P "$HOME"/.config/ + wget -q ${repo}/.config/update_theme.sh -P "$HOME"/.config/ gsettings set org.gnome.Terminal.Legacy.Profile:/org/gnome/terminal/legacy/profiles:/:"${GT_default}"/ use-custom-command true gsettings set org.gnome.Terminal.Legacy.Profile:/org/gnome/terminal/legacy/profiles:/:"${GT_default}"/ custom-command "fish" # Default colors @@ -121,7 +125,7 @@ main() { # === Micro configuration == mkdir "$HOME"/.config/micro - wget -q --show-progress https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/micro/settings.json -O "$HOME"/.config/micro/settings.json + wget -q --show-progress ${repo}/.config/micro/settings.json -O "$HOME"/.config/micro/settings.json micro -plugin install detectindent # === GL4D == @@ -168,7 +172,7 @@ main() { # === Flameshot == # Custom configuration rm "$HOME"/.config/flameshot/flameshot.ini 2> /dev/null - wget -q --show-progress https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/flameshot/flameshot.ini -P "$HOME"/.config/flameshot/ + wget -q --show-progress ${repo}/.config/flameshot/flameshot.ini -P "$HOME"/.config/flameshot/ # Change keybindings gsettings set org.gnome.shell.keybindings show-screenshot-ui "[]" local custom_keybindings_list @@ -187,7 +191,7 @@ main() { # === Emoji picker == # Custom configuration rm "$HOME"/.config/gazatu.xyz/emoji-picker.ini 2>/dev/null - wget -q --show-progress https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/gazatu.xyz/emoji-picker.ini -P "$HOME"/.config/gazatu.xyz/ + wget -q --show-progress ${repo}/.config/gazatu.xyz/emoji-picker.ini -P "$HOME"/.config/gazatu.xyz/ # Add keybinding custom_keybindings_list=$(gsettings get org.gnome.settings-daemon.plugins.media-keys custom-keybindings) if ! echo "$custom_keybindings_list" | grep -q "x11-emoji-picker" @@ -329,16 +333,16 @@ main() { firefox & sleep 2 pkill firefox - wget -q --show-progress https://git.mylloon.fr/Anri/confOS/raw/branch/main/.mozilla/firefox/user.js -P "$HOME"/.mozilla/firefox/*.default-release - curl -s https://git.mylloon.fr/Anri/confOS/raw/branch/main/.mozilla/firefox/user-arch.js >> "$HOME"/.mozilla/firefox/*.default-release/user.js + wget -q --show-progress ${repo}/.mozilla/firefox/user.js -P "$HOME"/.mozilla/firefox/*.default-release + curl -s ${repo}/.mozilla/firefox/user-arch.js >> "$HOME"/.mozilla/firefox/*.default-release/user.js # 2 fingers history control echo "export MOZ_USE_XINPUT2=1" >> "$HOME"/.profile # Hardware acceleration echo "export MOZ_DRM_DEVICE=/dev/dri/renderD128" >> "$HOME"/.profile # Download extension configuration (TODO: Check Download Folder's Name) - #wget -q --show-progress https://git.mylloon.fr/Anri/confOS/raw/branch/main/.mozilla/firefox/extensions/Dark-Reader-Settings.json -P "$HOME"/Téléchargements - #wget -q --show-progress https://git.mylloon.fr/Anri/confOS/raw/branch/main/.mozilla/firefox/extensions/SponsorBlockConfig.json -P "$HOME"/Téléchargements - #wget -q --show-progress https://git.mylloon.fr/Anri/confOS/raw/branch/main/.mozilla/firefox/extensions/auto-tab-discard-preferences.json -P "$HOME"/Téléchargements + #wget -q --show-progress ${repo}/.mozilla/firefox/extensions/Dark-Reader-Settings.json -P "$HOME"/Téléchargements + #wget -q --show-progress ${repo}/.mozilla/firefox/extensions/SponsorBlockConfig.json -P "$HOME"/Téléchargements + #wget -q --show-progress ${repo}/.mozilla/firefox/extensions/auto-tab-discard-preferences.json -P "$HOME"/Téléchargements # === Manual color == fish -c "set -Ux MANPAGER \"sh -c 'col -bx | bat -l man -p'\"" @@ -367,10 +371,10 @@ main() { sed -i "s/#AutoEnable=true/AutoEnable=false/g" /etc/bluetooth/main.conf # === VSCodium == - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/VSCodium/product.json -P "$HOME"/.config/VSCodium/ + wget -q ${repo}/.config/VSCodium/product.json -P "$HOME"/.config/VSCodium/ # === Git == - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/dotfiles/.gitconfig -O "$HOME"/.gitconfig + wget -q ${repo}/dotfiles/.gitconfig -O "$HOME"/.gitconfig # === Python == # Add PIP packages from Python to the path @@ -382,13 +386,13 @@ main() { echo | opam init fish -c "yes | opam init" opam install -y utop ocaml-lsp-server ocamlformat ocamlformat-rpc menhir - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/dotfiles/.ocamlformat -O "$HOME"/.ocamlformat + wget -q ${repo}/dotfiles/.ocamlformat -O "$HOME"/.ocamlformat # Add Opam packages from OCaml mkdir -p "$HOME"/.opam/default/bin fish -c "fish_add_path /home/anri/.opam/default/bin" # === Clang == - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/dotfiles/.clang-format -O "$HOME"/.clang-format + wget -q ${repo}/dotfiles/.clang-format -O "$HOME"/.clang-format # === Perl == # Add perl packages to path diff --git a/arch_wsl.sh b/arch_wsl.sh index 9b1e5eb..968a334 100644 --- a/arch_wsl.sh +++ b/arch_wsl.sh @@ -12,6 +12,10 @@ fi cd "$(dirname "$0")" # change script directory main() { + # Variables + local repo + repo=https://git.mylloon.fr/Anri/confOS/raw/branch/main + # === Init pacman == sudo pacman-key --init sudo pacman-key --populate @@ -104,24 +108,24 @@ main() { wget -q https://gitlab.com/kyb/fish_ssh_agent/raw/master/functions/fish_ssh_agent.fish -P "$HOME"/.config/fish/functions/ mkdir "$HOME"/.ssh # Custom config.fish - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/config_wsl.fish -O "$HOME"/.config/fish/config.fish + wget -q ${repo}/.config/fish/config_wsl.fish -O "$HOME"/.config/fish/config.fish # Fish theme fish -c "fish_config theme choose 'Base16 Eighties' && yes | fish_config theme save" fish -c "set fish_color_comment 5c6773" # custom comment color # Fish prompt rm "$HOME"/.config/fish/functions/fish_prompt.fish 2> /dev/null - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/functions/fish_prompt.fish -P "$HOME"/.config/fish/functions/ + wget -q ${repo}/.config/fish/functions/fish_prompt.fish -P "$HOME"/.config/fish/functions/ # EZA colors fish -c "set -Ux EXA_COLORS 'di=1;36:da=35'" # Add abbreviations - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/conf.d/abbr.fish -O "$HOME"/.config/fish/conf.d/abbr.fish - curl -s https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/conf.d/abbr_wsl.fish >> "$HOME"/.config/fish/conf.d/abbr.fish + wget -q ${repo}/.config/fish/conf.d/abbr.fish -O "$HOME"/.config/fish/conf.d/abbr.fish + curl -s ${repo}/.config/fish/conf.d/abbr_wsl.fish >> "$HOME"/.config/fish/conf.d/abbr.fish # Add aliases - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish + wget -q ${repo}/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish # === Micro configuration == mkdir "$HOME"/.config/micro - wget -q --show-progress https://git.mylloon.fr/Anri/confOS/raw/branch/main/.config/micro/settings.json -O "$HOME"/.config/micro/settings.json + wget -q --show-progress ${repo}/.config/micro/settings.json -O "$HOME"/.config/micro/settings.json micro -plugin install detectindent # === GL4D == @@ -171,7 +175,7 @@ main() { fish -c "set -Ux MANPAGER \"sh -c 'col -bx | bat -l man -p'\"" # === Git == - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/dotfiles/.gitconfig -O "$HOME"/.gitconfig + wget -q ${repo}/dotfiles/.gitconfig -O "$HOME"/.gitconfig # === Python == # Add PIP packages from Python @@ -183,7 +187,7 @@ main() { echo | opam init fish -c "yes | opam init" opam install -y utop ocaml-lsp-server ocamlformat ocamlformat-rpc menhir - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/dotfiles/.ocamlformat -O "$HOME"/.ocamlformat + wget -q ${repo}/dotfiles/.ocamlformat -O "$HOME"/.ocamlformat # Add Opam packages from OCaml mkdir -p "$HOME"/.opam/default/bin fish -c "fish_add_path $HOME/.opam/default/bin" @@ -191,14 +195,14 @@ main() { fish -c "set -Ux CAML_LD_LIBRARY_PATH $(opam var stublibs)" # === Clang == - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/dotfiles/.clang-format -O "$HOME"/.clang-format + wget -q ${repo}/dotfiles/.clang-format -O "$HOME"/.clang-format # === Valgrind == fish -c "set -Ux DEBUGINFOD_URLS https://debuginfod.archlinux.org" # === Unison == mkdir "$HOME"/.unison - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.unison/default.prf -O "$HOME"/.unison/default.prf + wget -q ${repo}/.unison/default.prf -O "$HOME"/.unison/default.prf # === Perl == # Add perl packages to path @@ -206,10 +210,10 @@ main() { # === Emacs == mkdir "$HOME"/.emacs.d - wget -q https://git.mylloon.fr/Anri/confOS/raw/branch/main/.emacs.d/init.el -O "$HOME"/.emacs.d/init.el + wget -q ${repo}/.emacs.d/init.el -O "$HOME"/.emacs.d/init.el # === Bash VSCode fix == - curl -s https://git.mylloon.fr/Anri/confOS/raw/branch/main/dotfiles/.bashrc >> "$HOME"/.bashrc + curl -s ${repo}/dotfiles/.bashrc >> "$HOME"/.bashrc # === MIDI files == {