Remove SDKMAN! in favor of pkgx (#115)

felipecrs · Apr 29, 2024 · f904283 · f904283
1 parent fbd2497
commit f904283
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 85 deletions.
diff --git a/home/.chezmoiremove b/home/.chezmoiremove
@@ -37,6 +37,9 @@
 .antigen/
 .antigenrc
 
+# pkgx can be used instead
+.sdkman/
+
 # Remove font variants there used to be installed but no longer are
 .local/share/fonts/Fira Code * Nerd Font Complete*.ttf
 !.local/share/fonts/Fira Code Regular Nerd Font Complete Mono.ttf

diff --git a/home/.chezmoiscripts/run_after_30-install-pkgx-packages.sh.tmpl b/home/.chezmoiscripts/run_after_30-install-pkgx-packages.sh.tmpl
@@ -29,6 +29,8 @@ done
 
 readonly wanted_packages=(
   opendev.org/git-review
+  openjdk.org
+  maven.apache.org
 )
 
 missing_packages=()

diff --git a/home/.chezmoiscripts/run_after_32-install-sdkman-packages.sh.tmpl b/home/.chezmoiscripts/run_after_32-install-sdkman-packages.sh.tmpl
diff --git a/home/.chezmoitemplates/sdkman-library b/home/.chezmoitemplates/sdkman-library
diff --git a/home/dot_local/bin/executable_full-upgrade.tmpl b/home/dot_local/bin/executable_full-upgrade.tmpl
@@ -3,13 +3,11 @@
 # {{ template "scripts-library" }}
 # {{ template "homebrew-library" }}
 # {{ template "volta-library" }}
-# {{ template "sdkman-library" }}
 
 # The following line is for ShellCheck to correctly identify the above include
 true || source ../../.chezmoitemplates/scripts-library
 true || source ../../.chezmoitemplates/homebrew-library
 true || source ../../.chezmoitemplates/volta-library
-true || source ../../.chezmoitemplates/sdkman-library
 
 ensure_path_entry "${HOME}/.local/bin"
 
@@ -151,15 +149,6 @@ if npm --version &>/dev/null; then
   c npm update --global
 fi
 
-# shellcheck disable=SC2310
-if sdk version &>/dev/null; then
-  log_task "Updating sdk"
-  c sdk selfupdate
-
-  log_task "Updating sdk packages"
-  c sdk update
-fi
-
 if timeout 2 wsl.exe --version &>/dev/null; then
   log_task "Updating VS Code"
   # WinGet returns non zero code if no upgrade is found, so for now we simply ignore it.

diff --git a/home/dot_sdkman/etc/config b/home/dot_sdkman/etc/config
diff --git a/home/dot_zshrc b/home/dot_zshrc
@@ -1,6 +1,6 @@
 # Load .profile
 if [[ -r "${HOME}/.profile" ]]; then
-  # Do not use emulate here, as SDKMAN! will produce errors otherwise
+  # Do not use emulate here, as pkgx errors with unsupported shell
   source "${HOME}/.profile"
 fi