From f8987818b8933f2b36eb86f59aea281b6fae065c Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Mon, 8 Jul 2024 10:15:48 +0300 Subject: [PATCH] chore(asdf): cleanup --- config/asdf/asdfrc | 12 ++++++------ scripts/install-asdf.sh | 5 +---- scripts/shared.sh | 14 ++------------ 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/config/asdf/asdfrc b/config/asdf/asdfrc index c8e02f8..1daaaf1 100644 --- a/config/asdf/asdfrc +++ b/config/asdf/asdfrc @@ -1,8 +1,8 @@ # See the docs for explanations: https://asdf-vm.com/manage/configuration.html -legacy_version_file = yes -use_release_candidates = no -always_keep_download = no -plugin_repository_last_check_duration = 60 -disable_plugin_short_name_repository = no -concurrency = auto +legacy_version_file=yes +use_release_candidates=no +always_keep_download=no +plugin_repository_last_check_duration=60 +disable_plugin_short_name_repository=no +concurrency=auto diff --git a/scripts/install-asdf.sh b/scripts/install-asdf.sh index 349d961..435eede 100755 --- a/scripts/install-asdf.sh +++ b/scripts/install-asdf.sh @@ -2,9 +2,7 @@ # # Install asdf -source "${XDG_CONFIG_HOME}/exports" -source "${XDG_CONFIG_HOME}/alias" -source "${XDG_CONFIG_HOME}/functions" +source "${XDG_CONFIG_HOME}/shared" source "${DOTFILES}/scripts/shared.sh" # Installation variables @@ -32,7 +30,6 @@ asdf plugin add asdf-plugin-manager https://github.com/asdf-community/asdf-plugi asdf install asdf-plugin-manager latest asdf global asdf-plugin-manager "$(asdf latest asdf-plugin-manager)" asdf-plugin-manager version -asdf-plugin-manager export > "${ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME}" asdf-plugin-manager add-all asdf install diff --git a/scripts/shared.sh b/scripts/shared.sh index 30babf9..9908ebd 100755 --- a/scripts/shared.sh +++ b/scripts/shared.sh @@ -12,21 +12,11 @@ || [[ -n $BASH_VERSION ]] && (return 0 2> /dev/null) ) && sourced=1 || sourced=0 -export DOTFILES="$HOME/.dotfiles" +source "$HOME/.dotfiles/config/shared" + DOTFILES_CURRENT_SHELL=$(ps -p $$ -oargs=) export DOTFILES_CURRENT_SHELL -# Explicitly set XDG folders -# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_STATE_HOME="$HOME/.local/state" - -# custom variables -export XDG_BIN_HOME="$HOME/.local/bin" -export XDG_CACHE_HOME="$HOME/.cache" -export XDG_RUNTIME_DIR="$HOME/.local/run" - # Other variables export OHMYPOSH_CFG="$HOME/.dotfiles/config/omp/own.toml"