From 88cd731ad8eb19b4e69fb84f0a2257543c3ccdbe Mon Sep 17 00:00:00 2001 From: Mylloon Date: Thu, 23 Nov 2023 17:17:49 +0100 Subject: [PATCH 1/4] Sync bat config --- Makefile | 5 +++++ arch_wsl.sh | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 05f215a..fcfe4b1 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,11 @@ sync-dotconfig: @echo "Micro settings synced!" @echo +# Bat + @$(WGET) $(REPO_SRC)/.config/bat/config -O $(HOME)/.config/bat/config + @echo "Bat settings synced!" + @echo + # Topgrade @$(WGET) $(REPO_SRC)/.config/topgrade/topgrade.toml -O $(HOME)/.config/topgrade.toml @echo "Topgrade settings synced!" diff --git a/arch_wsl.sh b/arch_wsl.sh index ef7ab1f..b22e71f 100644 --- a/arch_wsl.sh +++ b/arch_wsl.sh @@ -160,6 +160,10 @@ main() { fish -c "set -Ux MANPAGER \"sh -c 'col -bx | bat -l man -p'\"" fish -c "set -Ux MANROFFOPT \"-c\"" + # === Bat config == + mkdir -p "$HOME"/.config/bat + wget -q --show-progress ${repo}/.config/bat/config -O "$HOME"/.config/bat/config + # === Git == wget -q ${repo}/dotfiles/.gitconfig -O "$HOME"/.gitconfig From 93fa8613af8e4c55779b782015c6f7987955e337 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Thu, 23 Nov 2023 17:18:28 +0100 Subject: [PATCH 2/4] create directory --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index fcfe4b1..7c4d8bc 100644 --- a/Makefile +++ b/Makefile @@ -66,6 +66,7 @@ sync-dotconfig: @echo # Bat + @mkdir -p $(HOME)/.config/bat @$(WGET) $(REPO_SRC)/.config/bat/config -O $(HOME)/.config/bat/config @echo "Bat settings synced!" @echo From 9cdd2200496cee09b4b8b9168f52a027d8a8b3e4 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Thu, 23 Nov 2023 17:21:24 +0100 Subject: [PATCH 3/4] Revert "use Start-BitsTransfer instead of Invoke-WebRequest" This reverts commit 36c0698af8ee376dee8f78405f77a20bbec1a592. --- windows11.bat | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/windows11.bat b/windows11.bat index 5621bee..5a5df1e 100644 --- a/windows11.bat +++ b/windows11.bat @@ -13,7 +13,7 @@ fltmc >NUL 2>&1 || ( ECHO Please wait until the administrator popup appears :: === Install Spotify == - PowerShell -Command "Start-BitsTransfer -Source !repo!/windows/blockthespot.bat -Destination '!local!'" + PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/blockthespot.bat -OutFile '!local!\blockthespot.bat'" DEL "%APPDATA%\Spotify" ECHO Y| CMD /c "!local!\blockthespot.bat" yes PowerShell -Command "Stop-Process -Name Spotify -ErrorAction SilentlyContinue" @@ -145,20 +145,20 @@ PowerShell -Command "Install-PackageProvider -Name NuGet -Force" PowerShell -Command "Install-Module -Name PSWindowsUpdate -Force" :: === Download scripts == -PowerShell -Command "Start-BitsTransfer -Source !repo!/windows/ctmpf.bat -Destination '!local!'" -PowerShell -Command "Start-BitsTransfer -Source !repo!/windows/update.bat -Destination '!local!'" -PowerShell -Command "Start-BitsTransfer -Source !repo!/windows/fix_nvidia_wsl.bat -Destination '!local!'" -PowerShell -Command "Start-BitsTransfer -Source !repo!/windows/vencord_installer.bat -Destination '!local!'" -:: PowerShell -Command "Start-BitsTransfer -Source !repo!/windows/fix_obs_shortcut.bat -Destination '!local!'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/ctmpf.bat -OutFile '!local!\ctmpf.bat'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/update.bat -OutFile '!local!\update.bat'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/fix_nvidia_wsl.bat -OutFile '!local!\fix_nvidia_wsl.bat'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/vencord_installer.bat -OutFile '!local!\vencord_installer.bat'" +:: PowerShell -Command "Invoke-WebRequest -Uri !repo!/windows/fix_obs_shortcut.bat -OutFile '!local!\fix_obs_shortcut.bat'" :: === Programs installation == :: Install W10Privacy ECHO W10Privacy... -PowerShell -Command "Start-BitsTransfer -Source !repo!/W10Privacy.ini -Destination '%HOMEPATH%\Downloads'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/W10Privacy.ini -OutFile '%HOMEPATH%\Downloads\W10Privacy.ini'" ECHO Ensuite, utilise W10Privacy avec le fichier present dans %HOMEPATH%\Downloads. PowerShell -Command "" ^ "$archive = '%TEMP%\W10Privacy.zip';" ^ - "Start-BitsTransfer -Source https://www.w10privacy.de/app/download/12302828636/W10Privacy.zip -Destination $archive;" ^ + "Invoke-WebRequest -Uri https://www.w10privacy.de/app/download/12302828636/W10Privacy.zip -OutFile $archive;" ^ "Expand-Archive -Path $archive -DestinationPath $env:TEMP -Force;" ^ "$file = $env:TEMP + '\\' + (Get-ChildItem $env:TEMP\W10Privacy*.exe).BaseName + '.exe';" ^ "Start-Process $file /S -NoNewWindow -Wait -PassThru;" ^ @@ -171,7 +171,7 @@ PowerShell -Command "" ^ ECHO Geek Uninstaller... PowerShell -Command "" ^ "$archive = '%TEMP%\geek.zip';" ^ - "Start-BitsTransfer -Source https://geekuninstaller.com/geek.zip -Destination $archive;" ^ + "Invoke-WebRequest -Uri https://geekuninstaller.com/geek.zip -OutFile $archive;" ^ "Expand-Archive -Path $archive -DestinationPath '%ProgramFiles%\Geek Uninstaller' -Force;" ^ "$WshShell = New-Object -comObject WScript.Shell;" ^ "$Shortcut = $WshShell.CreateShortcut('%APPDATA%\Microsoft\Windows\Start Menu\Programs\Geek Uninstaller.lnk');" ^ @@ -186,7 +186,7 @@ PowerShell -Command "" ^ "$archive = 'LosslessCut-win-x64.7z';" ^ "$link = 'https://github.com/mifi/lossless-cut/releases/latest/download/' + $archive;" ^ "$outfile = Join-Path -Path $env:TEMP -ChildPath $archive;" ^ - "Start-BitsTransfer -Source $link -Destination $outfile;" ^ + "Invoke-WebRequest -Uri $link -OutFile $outfile;" ^ "cd $env:TEMP;" ^ "& $env:ProgramFiles\7-Zip\7z.exe x $archive -o'%ProgramFiles%\LosslessCut' -y;" ^ "$WshShell = New-Object -comObject WScript.Shell;" ^ @@ -202,7 +202,7 @@ PowerShell -Command "" ^ "$releases = 'https://git.mylloon.fr/api/v1/repos/Anri/dsr/releases/latest';" ^ "$link = (Invoke-WebRequest $releases | ConvertFrom-Json)[0].assets.browser_download_url;" ^ "$archive = '%TEMP%\dsr.zip';" ^ - "Start-BitsTransfer -Source $link -Destination $archive;" ^ + "Invoke-WebRequest -Uri $link -OutFile $archive;" ^ "Remove-Item '%LOCALAPPDATA%\DSR' -Recurse -ErrorAction SilentlyContinue;" ^ "Expand-Archive -Path $archive -DestinationPath '%LOCALAPPDATA%\DSR' -Force;" ^ "Move-Item -Path '%LOCALAPPDATA%\DSR\dsr-win32-x64\*' -Destination '%LOCALAPPDATA%\DSR' -Force;" ^ @@ -221,7 +221,7 @@ CMD /c "!local!\vencord_installer.bat" yes :: Install OpenTabletDriver ECHO OpenTabletDriver... PowerShell -Command "" ^ - "Start-BitsTransfer -Source https://opentabletdriver.net/Release/Download/OpenTabletDriver.win-x64.zip -Destination '%TEMP%\OpenTabletDriver.win-x64.zip';" ^ + "Invoke-WebRequest -Uri https://opentabletdriver.net/Release/Download/OpenTabletDriver.win-x64.zip -OutFile '%TEMP%\OpenTabletDriver.win-x64.zip';" ^ "Expand-Archive -Path '%TEMP%\OpenTabletDriver.win-x64.zip' -DestinationPath '%ProgramFiles%\OpenTabletDriver' -Force;" ^ "$WshShell = New-Object -comObject WScript.Shell;" ^ "$Shortcut = $WshShell.CreateShortcut('%APPDATA%\Microsoft\Windows\Start Menu\Programs\OpenTabletDriver.lnk');" ^ @@ -233,16 +233,16 @@ REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTabletDriv :: WindowsInk for OpenTabletDriver ECHO WindowsInk support for OpenTabletDriver... -PowerShell -Command "Start-BitsTransfer -Source https://github.com/X9VoiD/vmulti-bin/releases/download/v1.0/VMulti.Driver.zip -Destination '%TEMP%\VMulti-Driver.zip'" +PowerShell -Command "Invoke-WebRequest -Uri https://github.com/X9VoiD/vmulti-bin/releases/download/v1.0/VMulti.Driver.zip -OutFile '%TEMP%\VMulti-Driver.zip'" PowerShell -Command "Expand-Archive -Path '%TEMP%\VMulti-Driver.zip' -DestinationPath '%TEMP%\VMulti-Driver' -Force" CALL "%TEMP%\VMulti-Driver\install_hiddriver.bat" -PowerShell -Command "Start-BitsTransfer -Source https://github.com/X9VoiD/VoiDPlugins/releases/latest/download/WindowsInk.zip -Destination '%TEMP%\WindowsInk.zip'" +PowerShell -Command "Invoke-WebRequest -Uri https://github.com/X9VoiD/VoiDPlugins/releases/latest/download/WindowsInk.zip -OutFile '%TEMP%\WindowsInk.zip'" PowerShell -Command "Expand-Archive -Path '%TEMP%\WindowsInk.zip' -DestinationPath '%LOCALAPPDATA%\OpenTabletDriver\Plugins\Windows Ink' -Force" :: Presets of OpenTabletDriver ECHO Downloading OpenTabletDriver presets... -PowerShell -Command "Start-BitsTransfer -Source !repo!/opentabletdriver/vertical-main.json -Destination '%LOCALAPPDATA%\OpenTabletDriver\Presets'" -PowerShell -Command "Start-BitsTransfer -Source !repo!/opentabletdriver/vertical-second.json -Destination '%LOCALAPPDATA%\OpenTabletDriver\Presets'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/opentabletdriver/vertical-main.json -OutFile '%LOCALAPPDATA%\OpenTabletDriver\Presets\vertical-main.json'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/opentabletdriver/vertical-second.json -OutFile '%LOCALAPPDATA%\OpenTabletDriver\Presets\vertical-second.json'" :: Settings of OpenTabletDriver, using 'vertical-main.json' as default settings ECHO Setting up OpenTabletDriver... @@ -258,7 +258,7 @@ PowerShell -Command "" ^ "$link = \"https://github.com/$repo/releases/download/$tag/$file\";" ^ "$archive = 'vry.zip';" ^ "$outfile = Join-Path -Path $env:TEMP -ChildPath $archive;" ^ - "Start-BitsTransfer -Source $link -Destination $outfile;" ^ + "Invoke-WebRequest -Uri $link -OutFile $outfile;" ^ "cd $env:TEMP;" ^ "Expand-Archive -Path $archive -DestinationPath '%LOCALAPPDATA%\VALORANT-rank-yoinker' -Force;" ^ "$WshShell = New-Object -comObject WScript.Shell;" ^ @@ -276,7 +276,7 @@ PowerShell -Command "" ^ "$exe = 'Deceive.exe';" ^ "$link = 'https://github.com/molenzwiebel/Deceive/releases/latest/download/' + $exe;" ^ "$outfile = Join-Path -Path '%ProgramFiles%\Deceive' -ChildPath $exe;" ^ - "Start-BitsTransfer -Source $link -Destination $outfile;" ^ + "Invoke-WebRequest -Uri $link -OutFile $outfile;" ^ "$WshShell = New-Object -comObject WScript.Shell;" ^ "$Shortcut = $WshShell.CreateShortcut('%APPDATA%\Microsoft\Windows\Start Menu\Programs\Deceive.lnk');" ^ "$Shortcut.TargetPath = \"%ProgramFiles%\Deceive\$exe\";" ^ @@ -294,7 +294,7 @@ REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\Deceive" /f /v :: "$link = \"https://github.com/$repo/releases/download/$tag/$file\";" ^ :: "$archive = 'topgrade.zip';" ^ :: "$outfile = Join-Path -Path $env:TEMP -ChildPath $archive;" ^ -:: "Start-BitsTransfer -Source $link -Destination $outfile;" ^ +:: "Invoke-WebRequest -Uri $link -OutFile $outfile;" ^ :: "cd $env:TEMP;" ^ :: "Expand-Archive -Path $archive -DestinationPath '%ProgramFiles%\Topgrade' -Force" :: REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\Topgrade" /f /v DisplayName /t REG_SZ /d "Topgrade" @@ -310,7 +310,7 @@ REG ADD "HKCU\Software\Microsoft\Windows\CurrentVersion\Uninstall\Deceive" /f /v :: "$link = \"https://github.com/$repo/releases/download/$tag/$file\";" ^ :: "$archive = 'xournalpp.zip';" ^ :: "$outfile = Join-Path -Path $env:TEMP -ChildPath $archive;" ^ -:: "Start-BitsTransfer -Source $link -Destination $outfile;" ^ +:: "Invoke-WebRequest -Uri $link -OutFile $outfile;" ^ :: "cd $env:TEMP;" ^ :: "Expand-Archive -Path $archive -DestinationPath $env:TEMP -Force;" ^ :: "$exe = $env:TEMP + '\' + $file.Substring(0, $file.Length - 3) + 'exe';" ^ @@ -327,16 +327,16 @@ TASKKILL /im firefox.exe /F ECHO Firefox configuration... FOR /F %%i IN ('dir /B /S ^"%APPDATA%\Mozilla\Firefox\Profiles\*.default-release^"') DO SET "vbc=%%i" -PowerShell -Command "Start-BitsTransfer -Source !repo!/.mozilla/firefox/user.js -Destination '!vbc!'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/.mozilla/firefox/user.js -OutFile '!vbc!\user.js'" -PowerShell -Command "Start-BitsTransfer -Source !repo!/.mozilla/firefox/extensions/SponsorBlockConfig.json -Destination '%HOMEPATH%\Downloads'" -PowerShell -Command "Start-BitsTransfer -Source !repo!/.mozilla/firefox/extensions/auto-tab-discard-preferences.json -Destination '%HOMEPATH%\Downloads'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/.mozilla/firefox/extensions/SponsorBlockConfig.json -OutFile '%HOMEPATH%\Downloads\SponsorBlockConfig.json'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/.mozilla/firefox/extensions/auto-tab-discard-preferences.json -OutFile '%HOMEPATH%\Downloads\auto-tab-discard-preferences.json'" ECHO La configuration des differents Addons de Firefox est presente dans le dossier %HOMEPATH%\Downloads. :: Setup WindowsAutoNightMode ECHO WindowsAutoNightMode configuration... MKDIR "%APPDATA%\AutoDarkMode" 2>NUL -PowerShell -Command "Start-BitsTransfer -Source !repo!/.config/WindowsAutoNightMode/config.yaml -Destination '%APPDATA%\AutoDarkMode'" +PowerShell -Command "Invoke-WebRequest -Uri !repo!/.config/WindowsAutoNightMode/config.yaml -OutFile '%APPDATA%\AutoDarkMode\config.yaml'" "%LOCALAPPDATA%\Programs\AutoDarkMode\adm-app\AutoDarkModeApp.exe" :: :: Startup OBS replay buffer From 3c678bac50b43dbb5228cd564ce78558ae7b5bdf Mon Sep 17 00:00:00 2001 From: Mylloon Date: Fri, 24 Nov 2023 19:01:09 +0100 Subject: [PATCH 4/4] sfml --- arch_wsl.sh | 2 +- archinstall/user_configuration.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch_wsl.sh b/arch_wsl.sh index b22e71f..1a17cbd 100644 --- a/arch_wsl.sh +++ b/arch_wsl.sh @@ -38,7 +38,7 @@ main() { libsamplerate rsync doxygen otf-fira-sans ttf-fira-code texlive-binextra \ otf-fira-mono mingw-w64-gcc otf-font-awesome soundfont-fluid fluidsynth \ pulseaudio-alsa texlive-latexextra texlive-langfrench texlive-luatex \ - noto-fonts jdk-openjdk texlive-fontsrecommended + noto-fonts jdk-openjdk texlive-fontsrecommended sfml # === Rustup == diff --git a/archinstall/user_configuration.json b/archinstall/user_configuration.json index 50da640..3195c79 100644 --- a/archinstall/user_configuration.json +++ b/archinstall/user_configuration.json @@ -132,7 +132,8 @@ "trash-cli", "power-profiles-daemon", "jdk-openjdk", - "texlive-fontsrecommended" + "texlive-fontsrecommended", + "sfml" ], "plugin": null, "profile": {