diff --git a/.config/fish/conf.d/plugin-foreign-env.fish b/.config/fish/conf.d/plugin-foreign-env.fish index de3520f5..08ae5da1 120000 --- a/.config/fish/conf.d/plugin-foreign-env.fish +++ b/.config/fish/conf.d/plugin-foreign-env.fish @@ -1 +1 @@ -/nix/store/5mwkcnr0v9gdrchf645hdhhqz4dxrfxm-home-manager-files/.config/fish/conf.d/plugin-foreign-env.fish \ No newline at end of file +/nix/store/s6x9j782anhglyf659bgppz39nvphz6l-home-manager-files/.config/fish/conf.d/plugin-foreign-env.fish \ No newline at end of file diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 2f4dfcf4..dea280b9 120000 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1 +1 @@ -/nix/store/5mwkcnr0v9gdrchf645hdhhqz4dxrfxm-home-manager-files/.config/fish/config.fish \ No newline at end of file +/nix/store/s6x9j782anhglyf659bgppz39nvphz6l-home-manager-files/.config/fish/config.fish \ No newline at end of file diff --git a/.config/git/config b/.config/git/config index 5909848d..82574e19 100644 --- a/.config/git/config +++ b/.config/git/config @@ -21,4 +21,11 @@ [alias] fixup = commit --all --amend empty = commit --allow-empty -m 'Add an empty commit' - current-branch = symbolic-ref --short HEAD + current = symbolic-ref --short HEAD + # default = !git symbolic-ref refs/remotes/origin/HEAD | cut -f4 -d'/' # made error in dirty? + switch-default = !git checkout main 2>/dev/null || git checkout master 2>/dev/null + upstream = !git remote | grep -E '^upstream$'|| git remote | grep -E '^origin$' + duster = remote update origin --prune + refresh = !git switch-default && git pull "$(git upstream)" "$(git current)" + # Depending gh poi :) + all = !git refresh && gh poi diff --git a/home/.aliases.sh b/home/.aliases.sh index d055288b..89c00881 100644 --- a/home/.aliases.sh +++ b/home/.aliases.sh @@ -1,11 +1,5 @@ #!/usr/bin/env bash -alias git-switch-default='git checkout main 2>/dev/null || git checkout master 2>/dev/null' -alias git-upstream="git remote | grep -E '^upstream$'|| git remote | grep -E '^origin$'" -# https://github.com/kyanny/git-delete-merged-branches/pull/6 -alias git-delete-merged-branches="git branch --merged | grep -vE '((^\*)|^ *(main|master)$)' | xargs -I % git branch -d %" -alias git-cleanup-branches='git-switch-default && git pull $(git-upstream) $(git current-branch) && git fetch $(git-upstream) --tags --prune && git-delete-merged-branches' - alias la='exa --long --all --group-directories-first' alias zj='zellij attach "$(basename "$PWD")" || zellij --session "$(basename "$PWD")"'