ivuorinen/dotfiles
1
0
Fork 0
mirror of https://github.com/ivuorinen/dotfiles.git synced 2026-02-14 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: move asdf to ./local, update configs

Browse Source 
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
This commit is contained in:
Ismo Vuorinen
2025-02-17 12:17:45 +02:00
parent 8cf3602de1
commit 894ec12fd8
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/exports
View File

@@ -294,7 +294,7 @@ export SHORT_HOST=$(hostname -s)
# asdf # asdf
# https://github.com/asdf-vm/asdf # https://github.com/asdf-vm/asdf
msg "Setting up asdf configuration" msg "Setting up asdf configuration"
export ASDF_DIR="${XDG_BIN_HOME}/asdf" export ASDF_DIR="${HOME}/.local/asdf"
[[ -d $ASDF_DIR ]] && { [[ -d $ASDF_DIR ]] && {
# [[ -d $ASDF_DIR/completions ]] && FPATH="$ASDF_DIR/completions:$FPATH" # [[ -d $ASDF_DIR/completions ]] && FPATH="$ASDF_DIR/completions:$FPATH"
# [[ -d $ASDF_DIR/plugins ]] && FPATH="$ASDF_DIR/plugins:$FPATH" # [[ -d $ASDF_DIR/plugins ]] && FPATH="$ASDF_DIR/plugins:$FPATH"

18
config/fish/config.fish
View File

@@ -1,7 +1,15 @@
# ╭──────────────────────────────────────────────────────────╮
# │ fish/config.fish │
# ╰──────────────────────────────────────────────────────────╯
# ASDF configuration code
source $HOME/.local/asdf/asdf.fish
fish_add_path $HOME/.cargo/bin
fish_add_path $HOME/.local/bin
fish_add_path $HOME/.local/share/nvim/mason/bin
fish_add_path $HOME/.local/state/composer/vendor/bin
if status is-interactive if status is-interactive
# Commands to run in interactive sessions can go here # Commands to run in interactive sessions can go here
fish_add_path $HOME/.cargo/bin
fish_add_path $HOME/.local/bin
fish_add_path $HOME/.local/share/nvim/mason/bin
fish_add_path $HOME/.local/state/composer/vendor/bin
end end

3
install.conf.yaml
View File

@@ -40,6 +40,9 @@
relink: true relink: true
path: config/* path: config/*
exclude: [config/nvm, config/fzf] exclude: [config/nvm, config/fzf]
~/.local/asdf:
glob: true
path: local/asdf/*
~/.local/bin: ~/.local/bin:
glob: true glob: true
path: local/bin/* path: local/bin/*

1
local/asdf Submodule

Submodule local/asdf added at 54d15e3fa6

11
scripts/install-macos-defaults.sh
View File

@@ -22,11 +22,14 @@ while true; do
kill -0 "$$" || exit kill -0 "$$" || exit
done 2> /dev/null & done 2> /dev/null &
msgr nested "Change user shell to zsh if it is available and not the current" # Skip when shell is fish
if [[ $SHELL != $(which fish) ]]; then
msgr nested "Change user shell to zsh if it is available and not the current"
# Change user shell to zsh if not that already. # Change user shell to zsh if not that already.
if hash zsh 2> /dev/null; then if hash zsh 2> /dev/null; then
[[ $SHELL != $(which zsh) ]] && chsh -s "$(which zsh)" [[ $SHELL != $(which zsh) ]] && chsh -s "$(which zsh)"
fi
fi fi
############################################################################### ###############################################################################