diff options
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/.config/shell/git-aliasrc | 2 | ||||
| -rw-r--r-- | mac/.config/shell/profile | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mac/.config/shell/git-aliasrc b/mac/.config/shell/git-aliasrc index e6560c4..c32de43 100644 --- a/mac/.config/shell/git-aliasrc +++ b/mac/.config/shell/git-aliasrc @@ -286,7 +286,7 @@ compdef _git ggl=git-checkout alias gluc='git pull upstream $(git_current_branch)' alias glum='git pull upstream $(git_main_branch)' -# alias gp='git push' +alias gp='git push' alias gpd='git push --dry-run' ggf() { diff --git a/mac/.config/shell/profile b/mac/.config/shell/profile index e340f81..0b676be 100644 --- a/mac/.config/shell/profile +++ b/mac/.config/shell/profile @@ -11,8 +11,6 @@ export PATH="$PATH:/opt/homebrew/bin" export PATH="$PATH:$(find -L /opt/homebrew/Caskroom \( -name bin -o -name MacOS \) -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)" export PATH="$PATH:$(find -L /opt/homebrew/Cellar -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)" export PATH="$PATH:$(find -L /opt/homebrew/opt -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -)" -command -v asdf >/dev/null 2>&1 && export PATH="$(find -L ~/.local/share/asdf/installs -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" -command -v npm >/dev/null 2>&1 && export PATH="$(find -L ~/.local/share/npm -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH" unsetopt PROMPT_SP 2>/dev/null @@ -66,6 +64,7 @@ export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible/ansible.cfg" ### --- ASDF --- ### export ASDF_CONFIG_FILE="$XDG_CONFIG_HOME/asdf/asdfrc" export ASDF_DATA_DIR="$XDG_DATA_HOME/asdf" +export PATH="$ASDF_DATA_DIR/shims:$PATH" ### --- BAT --- ### export BAT_CONFIG_PATH="$XDG_CONFIG_HOME/bat/config" @@ -153,7 +152,9 @@ export MOZ_USE_XINPUT2=1 # Mozilla smooth scrolling/touchpads. export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/config" ### --- NPM --- ### -export NPM_CONFIG_USERCONFIG="~/.config/npm/.npmrc" +export NPM_CONFIG_USERCONFIG="$HOME/.config/npm/.npmrc" +export NPM_CONFIG_PREFIX="$XDG_DATA_HOME/npm" +export PATH="$NPM_CONFIG_PREFIX/bin:$PATH" ### --- NVM --- ### export NVM_DIR="$XDG_CONFIG_HOME/nvm" |