diff --git a/box_setup.sh b/box_setup.sh index 3160640..5d19a11 100755 --- a/box_setup.sh +++ b/box_setup.sh @@ -54,7 +54,7 @@ export BOX_SETUP_UPDATE_PKGS_CMD="$update_pkgs_cmd" # make dirs and copy configs/dotfiles source ./src_files/.config/zsh/.zshenv ./make_dirs.sh -./copy_configs.sh $2 +./copy_dotfiles.sh $2 # install programs source $ZDOTDIR/.zshenv diff --git a/copy_configs.sh b/copy_dotfiles.sh similarity index 84% rename from copy_configs.sh rename to copy_dotfiles.sh index 438391d..f4b0a27 100755 --- a/copy_configs.sh +++ b/copy_dotfiles.sh @@ -1,13 +1,13 @@ #!/bin/zsh -execute() { echo "executing: $@" && "$@" } +echo_and_execute() { echo "executing: $@" && "$@" } copy_file() { local from=$1 local to=$2 local filename=$(basename $from) - [[ -e $to/$filename ]] && execute rm $to/$filename - execute cp -p $from $to/$filename + [[ -e $to/$filename ]] && rm $to/$filename + echo_and_execute cp -p $from $to/$filename } copy_dir() { @@ -16,8 +16,8 @@ copy_dir() { pushd $from > /dev/null local directories=(`find . -mindepth 1 -maxdepth 1 -type d`) for dir in $directories; do - [[ -d $to/$dir ]] && execute rm -rf $to/$dir - execute cp -rp $dir $to/$dir + [[ -d $to/$dir ]] && rm -rf $to/$dir + echo_and_execute cp -rp $dir $to/$dir done local files=(`find . -mindepth 1 -maxdepth 1 -type f`) for file in $files; do diff --git a/src_files/.config/asdf/.placeholder b/src_files/.config/asdf/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/src_files/.config/mise/config.toml b/src_files/.config/mise/config.toml new file mode 100644 index 0000000..d5d6682 --- /dev/null +++ b/src_files/.config/mise/config.toml @@ -0,0 +1,4 @@ +[tools] +go = "1" +python = "3" +ruby = "3" diff --git a/src_files/.config/zsh/.zshenv b/src_files/.config/zsh/.zshenv index ac464ed..39dbcc1 100644 --- a/src_files/.config/zsh/.zshenv +++ b/src_files/.config/zsh/.zshenv @@ -1,6 +1,7 @@ # default programs export BROWSER='brave' export EDITOR='nvim' +export TERMINAL='ghostty' # env vars used for my organization structure export DIR_HOME_BOX="$HOME/dbox" @@ -23,7 +24,7 @@ export XDG_CACHE_HOME="$HOME/.cache" export XDG_DATA_HOME="$DIR_LOCAL/share" export XDG_STATE_HOME="$DIR_LOCAL/state" export XDG_DATA_DIRS="/usr/local/share:/usr/share" -#export XDG_CONFIG_DIRS="/etc/xdg" # TODO: does this work on macos? +#export XDG_CONFIG_DIRS="/etc/xdg" # TODO: does this work on macOS? # zsh export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway @@ -31,12 +32,6 @@ export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway # git export GIT_EDITOR="$EDITOR" -# language support/tools -export ASDF_DIR="$XDG_CONFIG_HOME/asdf" -export ASDF_CONFIG_FILE="$ASDF_DIR/.asdfrc" -export ASDF_DATA_DIR="$DIR_LOCAL/.asdf" -export ASDF_TOOL_VERSIONS_FILENAME=".asdf_tool_versions" - # clean-up of home dir export __CF_USER_TEXT_ENCODING="0x0:0x0" diff --git a/src_files/.config/zsh/.zshrc b/src_files/.config/zsh/.zshrc index bcf6873..9be07dd 100644 --- a/src_files/.config/zsh/.zshrc +++ b/src_files/.config/zsh/.zshrc @@ -33,6 +33,7 @@ alias ncspotkeys="$EDITOR $DIR_GIT_PROJECTS/other/ncspot/doc/users.md" [[ -a "$ZDOTDIR/zsh-general-dev" ]] && source "$ZDOTDIR/zsh-general-dev" [[ -a "$ZDOTDIR/zsh-life-system" ]] && source "$ZDOTDIR/zsh-life-system" -# TODO: refactor the below; simplify or at least move elsewhere +# dev/lang setup +[[ -n $(command -v mise) ]] && eval "$(mise activate zsh)" export DEVKITARM=/opt/devkitpro/devkitARM -. $(brew --prefix asdf)/libexec/asdf.sh +