From fffd781bd2e6a58fb146af2d5f3ae2a4395102bc Mon Sep 17 00:00:00 2001 From: Mylloon Date: Sun, 6 Oct 2024 21:19:47 +0200 Subject: [PATCH] wget changes --- arch.sh | 22 ++++++++++------------ meta.sh | 18 ++++++++---------- termux.sh | 3 +-- wsl.sh | 2 +- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/arch.sh b/arch.sh index 25d0826..ff89795 100644 --- a/arch.sh +++ b/arch.sh @@ -79,7 +79,7 @@ function main { # 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 ${repo}/.config/update_theme.sh -P "$HOME"/.config/ + wget -q ${repo}/.config/update_theme.sh -O "$HOME"/.config/update_theme.sh 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 @@ -114,8 +114,7 @@ function main { # === Flameshot == # Custom configuration - rm "$HOME"/.config/flameshot/flameshot.ini 2> /dev/null ||: - wget -q --show-progress ${repo}/.config/flameshot/flameshot.ini -P "$HOME"/.config/flameshot/ + wget -q --show-progress ${repo}/.config/flameshot/flameshot.ini -O "$HOME"/.config/flameshot/flameshot.ini # Change keybindings gsettings set org.gnome.shell.keybindings show-screenshot-ui "[]" local custom_keybindings_list flameshot_shortcuts @@ -140,8 +139,7 @@ function main { # === Emoji picker == # Custom configuration - rm "$HOME"/.config/gazatu.xyz/emoji-picker.ini 2>/dev/null ||: - wget -q --show-progress ${repo}/.config/gazatu.xyz/emoji-picker.ini -P "$HOME"/.config/gazatu.xyz/ + wget -q --show-progress ${repo}/.config/gazatu.xyz/emoji-picker.ini -O "$HOME"/.config/gazatu.xyz/emoji-picker.ini # Add keybinding custom_keybindings_list=$(gsettings get ${gs_mediakey} custom-keybindings) if ! echo "$custom_keybindings_list" | grep -q "x11-emoji-picker" @@ -240,7 +238,7 @@ function main { gsettings set org.gnome.TextEditor show-line-numbers true # Configuration Blackbox - wget -q --show-progress ${repo}/.local/share/blackbox/user-keymap.json -P "$HOME"/.local/share/blackbox/ # keymap # TODO: Quid de mkdir avant? est-ce que un fichier existe pas déjà ?? + wget -q --show-progress ${repo}/.local/share/blackbox/user-keymap.json -O "$HOME"/.local/share/blackbox/user-keymap.json # keymap # TODO: Quid de mkdir avant? gsettings set com.raggesilver.BlackBox use-custom-command true # custom shell gsettings set com.raggesilver.BlackBox custom-shell-command "fish" # use fish as default gsettings set com.raggesilver.BlackBox easy-copy-paste true # allow ^C and ^V @@ -299,9 +297,9 @@ function main { # 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 ${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 + #wget -q --show-progress ${repo}/.mozilla/firefox/extensions/Dark-Reader-Settings.json -O "$HOME"/Téléchargements/Dark-Reader-Settings.json + #wget -q --show-progress ${repo}/.mozilla/firefox/extensions/SponsorBlockConfig.json -O "$HOME"/Téléchargements/SponsorBlockConfig.json + #wget -q --show-progress ${repo}/.mozilla/firefox/extensions/auto-tab-discard-preferences.json -O "$HOME"/Téléchargements/auto-tab-discard-preferences.json # === Docker == @@ -331,7 +329,7 @@ function main { # === VSCodium == - wget -q ${repo}/.config/VSCodium/product.json -P "$HOME"/.config/VSCodium/ + wget -q ${repo}/.config/VSCodium/product.json -O "$HOME"/.config/VSCodium/product.json # === Discord == @@ -366,7 +364,7 @@ function main { # === s-tui == # Configuration - wget -q --show-progress ${repo}/.config/s-tui/s-tui.conf -P "$HOME"/.config/s-tui/ + wget -q --show-progress ${repo}/.config/s-tui/s-tui.conf -O "$HOME"/.config/s-tui/s-tui.conf # === ClamAV == @@ -380,7 +378,7 @@ function main { # === GPU Screen recorder == # Configuration - wget -q --show-progress ${repo}/.config/gpu-screen-recorder.env -P "$HOME"/.config/ + wget -q --show-progress ${repo}/.config/gpu-screen-recorder.env -O "$HOME"/.config/gpu-screen-recorder.env # Enable systemctl enable --now --user gpu-screen-recorder # Keybind diff --git a/meta.sh b/meta.sh index 523aa35..23fd3d7 100644 --- a/meta.sh +++ b/meta.sh @@ -68,14 +68,13 @@ function main { fish -c "fisher install jethrokuan/fzf" fish -c "fisher install jorgebucaran/autopair.fish" # SSH - wget -q https://gitlab.com/kyb/fish_ssh_agent/raw/master/functions/fish_ssh_agent.fish -P "$HOME"/.config/fish/functions/ + wget -q https://gitlab.com/kyb/fish_ssh_agent/raw/master/functions/fish_ssh_agent.fish -O "$HOME"/.config/fish/functions/fish_ssh_agent.fish mkdir -p "$HOME"/.ssh # 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 "${repo}"/.config/fish/functions/fish_prompt.fish -P "$HOME"/.config/fish/functions/ + wget -q "${repo}"/.config/fish/functions/fish_prompt.fish -O "$HOME"/.config/fish/functions/fish_prompt.fish # EZA colors fish -c "set -Ux EXA_COLORS 'di=1;36:da=35'" # Add configuration @@ -85,13 +84,12 @@ function main { # Add aliases wget -q "${repo}"/.config/fish/conf.d/alias.fish -O "$HOME"/.config/fish/conf.d/alias.fish # Add functions - wget -q "${repo}"/.config/fish/functions/catall.fish -P "$HOME"/.config/fish/functions/ - wget -q "${repo}"/.config/fish/functions/latex-color.fish -P "$HOME"/.config/fish/functions/ - wget -q "${repo}"/.config/fish/functions/makeaway.fish -P "$HOME"/.config/fish/functions/ - wget -q "${repo}"/.config/fish/functions/ssh-export.fish -P "$HOME"/.config/fish/functions/ - wget -q "${repo}"/.config/fish/functions/ssh-import.fish -P "$HOME"/.config/fish/functions/ - wget -q "${repo}"/.config/fish/functions/ugc.fish -P "$HOME"/.config/fish/functions/ - wget -q "${repo}"/.config/fish/functions/update-theme.fish -P "$HOME"/.config/fish/functions/ + functions=("catall" "latex-color" "makeaway" "ssh-export" "ssh-import" "ugc" + "update-theme") + for function in "${functions[@]}" + do + wget -q "${repo}"/.config/fish/functions/"${function}".fish -O "$HOME"/.config/fish/functions/"${function}".fish + done # === Default editor == diff --git a/termux.sh b/termux.sh index aa69f57..52d1515 100644 --- a/termux.sh +++ b/termux.sh @@ -39,8 +39,7 @@ function main { 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 "${repo}"/.config/fish/functions/fish_prompt.fish -P "$HOME"/.config/fish/functions/ + wget -q "${repo}"/.config/fish/functions/fish_prompt.fish -O "$HOME"/.config/fish/functions/fish_prompt.fish # EZA colors fish -c "set -Ux EXA_COLORS 'di=1;36:da=35'" # Add configuration diff --git a/wsl.sh b/wsl.sh index 668d6cb..6166618 100644 --- a/wsl.sh +++ b/wsl.sh @@ -83,7 +83,7 @@ function main { curl -s ${repo}/.config/fish/conf.d/abbr_wsl.fish >> "$HOME"/.config/fish/conf.d/abbr.fish curl -s ${repo}/.config/fish/conf.d/alias_wsl.fish >> "$HOME"/.config/fish/conf.d/alias.fish # Specific WSL functions - #wget -q "${repo}"/.config/fish/functions/trash.fish -P "$HOME"/.config/fish/functions/ + #wget -q "${repo}"/.config/fish/functions/trash.fish -O "$HOME"/.config/fish/functions/trash.fish # === OCaml ==