Skip to content

Commit bd8a96c

Browse files
committed
Move complete-alias to nix + complete all aliases
1 parent 96b3835 commit bd8a96c

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "lib/complete-alias"]
2-
path = lib/complete-alias
3-
url = https://github.com/cykerway/complete-alias.git
41
[submodule "lib/kubectl-aliases"]
52
path = lib/kubectl-aliases
63
url = https://github.com/giggio/kubectl-aliases.git

aliases/custom.aliases.bash

+15-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
2-
# shellcheck source=/dev/null
3-
source "$DIR"/../lib/complete-alias/complete_alias
42

53
# enable color support of ls and also add handy aliases
64
if [ -x /usr/bin/dircolors ]; then
@@ -30,25 +28,15 @@ alias cls=clear
3028
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
3129

3230
alias add='git add'
33-
complete -F _complete_alias add
3431
alias st='git status'
35-
complete -F _complete_alias st
3632
alias log='git log'
37-
complete -F _complete_alias log
3833
alias ci='git commit'
39-
complete -F _complete_alias ci
4034
alias push='git push'
41-
complete -F _complete_alias push
4235
alias pushf='git push --force-with-lease'
43-
complete -F _complete_alias pushf
4436
alias co='git checkout'
45-
complete -F _complete_alias co
4637
alias pull='git pull'
47-
complete -F _complete_alias pull
4838
alias fixup='git fixup'
49-
complete -F _complete_alias fixup
5039
alias dif='git diff'
51-
complete -F _complete_alias dif
5240
alias pushsync='git push --set-upstream origin `git rev-parse --abbrev-ref HEAD`'
5341
if hash hub 2>/dev/null; then
5442
alias git=hub
@@ -62,20 +50,12 @@ if hash kubectl 2>/dev/null; then
6250
# shellcheck source=/dev/null
6351
source "$DIR"/../lib/kubectl-aliases/.kubectl_aliases
6452
fi
65-
ALIASES=$(awk -F'[ =]' '/^alias / {print $2}' "$DIR"/../lib/kubectl-aliases/.kubectl_aliases)
66-
for ALIAS in $ALIASES; do
67-
complete -F _complete_alias "$ALIAS"
68-
done
69-
unset ALIASES
70-
unset ALIAS
7153
else
7254
alias k=kubectl
73-
complete -F _complete_alias k
7455
fi
7556
fi
7657
if hash istioctl 2>/dev/null; then
7758
alias istio=istioctl
78-
complete -F _complete_alias istio
7959
fi
8060
if hash terraform 2>/dev/null; then
8161
alias tf=terraform
@@ -103,3 +83,18 @@ if hash kitty 2>/dev/null; then
10383
fi
10484

10585
alias hm='home-manager --flake ~/.dotfiles/config/home-manager --impure'
86+
87+
function gitignore () {
88+
if [ -v 1 ]; then
89+
case "$1" in
90+
-v|--version|-h|--help|-l|--list)
91+
git-ignore "$@"
92+
;;
93+
*)
94+
git-ignore "$@" > .gitignore
95+
;;
96+
esac
97+
else
98+
git-ignore -a > .gitignore
99+
fi
100+
}

completions/999_wrapup.bash

+3
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ if ! [ -d "$COMPLETIONS_DIR" ]; then
22
mkdir -p "$COMPLETIONS_DIR"
33
updateCompletions
44
fi
5+
6+
# auto complete all aliases
7+
complete -F _complete_alias "${!BASH_ALIASES[@]}"

lib/complete-alias

-1
This file was deleted.

0 commit comments

Comments
 (0)