merge: work
This commit is contained in:
commit
17979e11e3
@ -55,3 +55,6 @@ vim.keymap.set("n", "<Leader>f", "<cmd>%s/\\s\\+$//e<CR>")
|
|||||||
|
|
||||||
-- copy entire file to graphical buffer
|
-- copy entire file to graphical buffer
|
||||||
vim.keymap.set("n", "<Leader>y", 'ggVG"+y<C-o>' )
|
vim.keymap.set("n", "<Leader>y", 'ggVG"+y<C-o>' )
|
||||||
|
|
||||||
|
-- copy selection to graphical buffer
|
||||||
|
vim.keymap.set("v", "<Leader>y", '"+y' )
|
||||||
|
@ -12,6 +12,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
alias kx='kubectx'
|
||||||
|
alias kn='kubens'
|
||||||
alias k='kubectl'
|
alias k='kubectl'
|
||||||
alias ksys='kubectl --namespace=kube-system'
|
alias ksys='kubectl --namespace=kube-system'
|
||||||
alias ka='kubectl apply --recursive -f'
|
alias ka='kubectl apply --recursive -f'
|
||||||
|
@ -12,8 +12,8 @@ alias wconf="$EDITOR $HOME/.config/sway"
|
|||||||
alias zshconf="$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc"
|
alias zshconf="$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc"
|
||||||
|
|
||||||
function fnalias() {
|
function fnalias() {
|
||||||
# alias alias_cmd='cmd'
|
|
||||||
cmd="$(alias "$2")"
|
cmd="$(alias "$2")"
|
||||||
|
shell="$(ps -q "$$" -o 'comm=')"
|
||||||
|
|
||||||
if [ -n "$cmd" ]; then
|
if [ -n "$cmd" ]; then
|
||||||
# remove everything before and including the first =
|
# remove everything before and including the first =
|
||||||
@ -24,7 +24,8 @@ function fnalias() {
|
|||||||
cmd="$2"
|
cmd="$2"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
env "$1" "$cmd" "${@:3}"
|
$shell -c "$1 $(echo "$cmd" | sed 's/--color=.\+/--color=force/') ${@:3}"
|
||||||
}
|
}
|
||||||
|
|
||||||
alias watch='fnalias watch'
|
alias watch='fnalias "watch -c"'
|
||||||
|
alias xargs='fnalias xargs'
|
||||||
|
10
bin/dkpurge
10
bin/dkpurge
@ -53,10 +53,10 @@ if [ -n "$PS" ]; then
|
|||||||
$READ
|
$READ
|
||||||
case "${ANS,,}" in
|
case "${ANS,,}" in
|
||||||
'y'|'yes'|'')
|
'y'|'yes'|'')
|
||||||
echo "$PS" | xargs docker rm 2> /dev/null
|
docker rm "$PS" 2> /dev/null
|
||||||
;;
|
;;
|
||||||
'a'|'all')
|
'a'|'all')
|
||||||
echo "$PS" | xargs docker rm -f
|
docker rm -f "$PS"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
@ -69,7 +69,7 @@ if [ -n "$VOL" ]; then
|
|||||||
$READ
|
$READ
|
||||||
case "${ANS,,}" in
|
case "${ANS,,}" in
|
||||||
'y'|'yes'|'a'|'all'|'')
|
'y'|'yes'|'a'|'all'|'')
|
||||||
echo "$VOL" | xargs docker volume rm -f 2> /dev/null
|
docker volume rm -f "$VOL" 2> /dev/null
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
@ -87,10 +87,10 @@ if [ -n "$IMG" ]; then
|
|||||||
TO_CLEAN="$TO_CLEAN $img"
|
TO_CLEAN="$TO_CLEAN $img"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
echo "$TO_CLEAN" | xargs docker image rm -f 2> /dev/null
|
docker image rm -f "$TO_CLEAN" 2> /dev/null
|
||||||
;;
|
;;
|
||||||
'a'|'all')
|
'a'|'all')
|
||||||
echo "$IMG" | xargs docker image rm -f 2> /dev/null
|
docker image rm -f "$IMG" 2> /dev/null
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user