diff --git a/.config/fish/conf.d/abbr.fish b/.config/fish/conf.d/abbr.fish index 70675ef..3119710 100644 --- a/.config/fish/conf.d/abbr.fish +++ b/.config/fish/conf.d/abbr.fish @@ -5,7 +5,7 @@ abbr .... "cd ../../.." abbr ..... "cd ../../../.." abbr ...... "cd ../../../../.." abbr - "cd -" -abbr bigupdate "paru -Syu --noconfirm && tldr --update && yes | sdk update && yes | sdk upgrade java" +abbr bigupdate "paru -Syu --noconfirm && tldr --update && yes" abbr cat "bat -pp" abbr c command # Cancel abbreviation, alias of \ abbr cd.. "cd .." diff --git a/arch.sh b/arch.sh index 7d3d158..340f22e 100644 --- a/arch.sh +++ b/arch.sh @@ -305,22 +305,6 @@ main() { echo "style_main_window=true" >> /usr/share/copyq/themes/dark.ini copyq loadTheme /usr/share/copyq/themes/dark.ini - # === Java == - curl -s "https://get.sdkman.io" | bash - # Temporary disable nounset for SDK - set +o nounset - # shellcheck source=/dev/null - source "$HOME/.sdkman/bin/sdkman-init.sh" - if [ -x "$HOME"/.config/fish ] ; then - if [ ! -f "$HOME"/.config/fish/functions/fisher.fish ] ; then # install fisher if not already installed - curl -sL https://git.io/fisher | fish -c "source && fisher install jorgebucaran/fisher" - fi - fish -c "fisher install reitzig/sdkman-for-fish" - fi - sdk install java 17.0.8.1-tem # https://whichjdk.com/#adoptium-eclipse-temurin - # Renable nounset - set -o nounset - # === UBW (pare-feu) == ufw enable diff --git a/arch_wsl.sh b/arch_wsl.sh index 0f3a4dc..50dc58c 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 + noto-fonts jdk-openjdk # === Rustup == @@ -155,22 +155,6 @@ main() { wget -q --show-progress "${url_tldr:1}" -O completions_fish mv completions_fish ~/.config/fish/completions/tldr.fish - # === Java == - curl -s "https://get.sdkman.io" | bash - # Temporary disable nounset for SDK - set +o nounset - # shellcheck source=/dev/null - source "$HOME/.sdkman/bin/sdkman-init.sh" - if [ -x "$HOME"/.config/fish ] ; then - if [ ! -f "$HOME"/.config/fish/functions/fisher.fish ] ; then # install fisher if not already installed - curl -sL https://git.io/fisher | fish -c "source && fisher install jorgebucaran/fisher" - fi - fish -c "fisher install reitzig/sdkman-for-fish" - fi - sdk install java 17.0.8.1-tem # https://whichjdk.com/#adoptium-eclipse-temurin - # Renable nounset - set -o nounset - # === Manual color == fish -c "set -Ux MANPAGER \"sh -c 'col -bx | bat -l man -p'\"" fish -c "set -Ux MANROFFOPT \"-c\"" diff --git a/archinstall/user_configuration.json b/archinstall/user_configuration.json index 25e6dae..9d2c074 100644 --- a/archinstall/user_configuration.json +++ b/archinstall/user_configuration.json @@ -130,7 +130,8 @@ "gnome-shell-extension-appindicator", "libreoffice-fresh", "trash-cli", - "power-profiles-daemon" + "power-profiles-daemon", + "jdk-openjdk" ], "plugin": null, "profile": {