diff --git a/.gitconfig b/.gitconfig index 4166a4b..81707d7 100644 --- a/.gitconfig +++ b/.gitconfig @@ -23,3 +23,7 @@ path = ~/.gitconfig_local [includeIf "gitdir:~/code/"] path = ~/code/.gitconfig +[branch] + sort = committerdate +[diff] + algorithm = histogram diff --git a/.zshenv b/.zshenv index a89b410..a605dbe 100644 --- a/.zshenv +++ b/.zshenv @@ -42,6 +42,8 @@ if [ -f "$HOME/.local/share/pnpm" ]; then esac fi +[ -d "$HOME/.asdf" ] && export PATH="$HOME/.asdf/shims:$PATH" + export PATH="$PATH:/home/kaholaz/.cache/scalacli/local-repo/bin/scala-cli" # >>> coursier install directory >>> diff --git a/.zshrc b/.zshrc index 113a240..173ef7e 100644 --- a/.zshrc +++ b/.zshrc @@ -45,10 +45,6 @@ if [ -z "$TMUX" ] && [[ "$HAS_NETWORK" == 1 ]]; then fortune -s fi -if [ -d "$HOME/.asdf" ]; then - \. "$HOME/.asdf/asdf.sh" -fi - export NVM_DIR="$HOME/.nvm" if [ -s "$NVM_DIR/nvm.sh" ]; then [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm diff --git a/README.md b/README.md index e2bbaf3..2647937 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,13 @@ # To install: -git clone --bare git@github.com:Kaholaz/dotfiles.git $HOME/.dotfiles +git clone --bare http://git.kaholaz.net/kaholaz/dotfiles $HOME/.dotfiles -alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' +alias dotf='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' -dotfiles config --local status.showUntrackedFiles no +dotf config --local status.showUntrackedFiles no -dotfiles restore --staged . (WARNING: DELETES ANY LOCAL DOTFILES) +dotf restore --staged . + +dotf restore . + +dotf remote set-url origin git@git.kaholaz.net:kaholaz/dotfiles.git -dotfiles checkout