Merge branch 'master' of ssh://git.0l.de:2222/stv0g/dotfiles
This commit is contained in:
commit
1b91432bdc
5 changed files with 24 additions and 8 deletions
|
@ -17,10 +17,8 @@ alias ka=killall
|
|||
|
||||
alias g=git
|
||||
alias k=kubectl
|
||||
alias kns=kubens
|
||||
alias kctx=kubectx
|
||||
alias a=ansible
|
||||
alias c=code-insiders
|
||||
alias c=code
|
||||
alias e=$EDITOR
|
||||
|
||||
# Completion for aliases
|
||||
|
|
|
@ -38,8 +38,17 @@ if type doctl > /dev/null 2>&1; then
|
|||
source <(doctl completion bash)
|
||||
fi
|
||||
|
||||
if type helm > /dev/null 2>&1; then
|
||||
source <(helm completion bash)
|
||||
# Homebrew completions
|
||||
if command -v brew > /dev/null; then
|
||||
HOMEBREW_PREFIX=$(brew --prefix)
|
||||
if type brew &>/dev/null; then
|
||||
for COMPLETION in "$HOMEBREW_PREFIX"/etc/bash_completion.d/*; do
|
||||
[[ -f $COMPLETION ]] && source "$COMPLETION"
|
||||
done
|
||||
if [[ -f ${HOMEBREW_PREFIX}/etc/profile.d/bash_completion.sh ]]; then
|
||||
source "${HOMEBREW_PREFIX}/etc/profile.d/bash_completion.sh"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if type brew > /dev/null 2>&1; then
|
||||
|
|
|
@ -52,8 +52,8 @@ if [ -d /opt/man-pages ]; then
|
|||
export MANPATH=/opt/man-pages:${MANPATH}
|
||||
fi
|
||||
|
||||
if [ -x /usr/local/bin/code-insiders ]; then
|
||||
export EDITOR="/usr/local/bin/code-insiders -w"
|
||||
if [ type code > /dev/null 2>&1 ]; then
|
||||
export EDITOR="code -w"
|
||||
else
|
||||
export EDITOR=vim
|
||||
fi
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
|
||||
[difftool "sourcetree"]
|
||||
cmd = code-insiders --diff --wait \"$LOCAL\" \"$REMOTE\"
|
||||
path =
|
||||
[mergetool "sourcetree"]
|
||||
cmd = code-insiders -n --wait \"$MERGED\"
|
||||
trustExitCode = true
|
||||
|
|
|
@ -59,6 +59,10 @@ Host villas-demo.os-cloud.eonerc.rwth-aachen.de
|
|||
Host keycloak.os-cloud.eonerc.rwth-aachen.de
|
||||
User ubuntu
|
||||
|
||||
Host acs-fedora-svg-2
|
||||
User svg
|
||||
HostName 134.130.169.13
|
||||
|
||||
Host inl-villas
|
||||
User root
|
||||
HostName 141.221.118.93
|
||||
|
@ -80,6 +84,12 @@ Host dtu-villas
|
|||
ForwardAgent yes
|
||||
HostName 10.10.12.22
|
||||
|
||||
Host tud-villas
|
||||
User iepg
|
||||
ProxyJump villas-hub
|
||||
ForwardAgent yes
|
||||
HostName 10.10.12.21
|
||||
|
||||
Host acs-nrg5-vpmu-demo
|
||||
HostName 10.100.1.142
|
||||
User ubuntu
|
||||
|
|
Loading…
Add table
Reference in a new issue