Compare commits

...

10 commits

4 changed files with 46 additions and 26 deletions

View file

@ -26,6 +26,7 @@ alias psag='ps aux | grep'
alias ka=killall
alias k=kubectl
alias code=vscodium
# Some shortcuts for me
function moby() {
@ -110,3 +111,5 @@ function restic() {
}
alias acs-pass='PASSWORD_STORE_DIR=~/workspace/rwth/acs/Passwords pass'
alias chaos-family-invite='ssh -t root@chaos.family /root/sbot invite.create 1 | jq -r . | pbcopy'

View file

@ -15,7 +15,27 @@ if type aws_completer > /dev/null 2>&1; then
fi
if type ykman > /dev/null 2>&1; then
source <(_YKMAN_COMPLETE=source ykman)
_ykman_completion() {
local IFS=$'
'
COMPREPLY=( $( env COMP_WORDS="${COMP_WORDS[*]}" \
COMP_CWORD=$COMP_CWORD \
_YKMAN_COMPLETE=complete $1 ) )
return 0
}
_ykman_completionetup() {
local COMPLETION_OPTIONS=""
local BASH_VERSION_ARR=(${BASH_VERSION//./ })
# Only BASH version 4.4 and later have the nosort option.
if [ ${BASH_VERSION_ARR[0]} -gt 4 ] || ([ ${BASH_VERSION_ARR[0]} -eq 4 ] && [ ${BASH_VERSION_ARR[1]} -ge 4 ]); then
COMPLETION_OPTIONS="-o nosort"
fi
complete $COMPLETION_OPTIONS -F _ykman_completion ykman
}
_ykman_completionetup;
fi
if type kubectl > /dev/null 2>&1; then
@ -28,4 +48,4 @@ fi
if type doctl > /dev/null 2>&1; then
source <(doctl completion bash)
fi
fi

View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
export GOPATH=~/build/go
source $HOME/.cargo/env
@ -9,23 +8,6 @@ fi
if [ -d $GOPATH/bin ]; then
export PATH=$GOPATH/bin:$PATH
=======
export PATH=~/bin/scripts:~/bin:/usr/local/bin:$PATH
# We are on a Macports system
if [ -d /opt/local ]; then
export PATH=/opt/local/bin:$PATH
export PATH=/opt/local/Library/Frameworks/Python.framework/Versions/Current/bin/:$PATH
export PATH=/opt/local/libexec/gnubin:$PATH
fi
if [ "$(id -u)" -eq "0" ]; then
if [ -d /opt/local/sbin ]; then
export PATH=/opt/local/sbin:$PATH
fi
export PATH=/usr/local/sbin:$PATH
>>>>>>> f2eb8b201305d0dc745297c82466df103afbcc76
fi
# OS X stuff if availabe
@ -75,7 +57,7 @@ else
export EDITOR=vim
fi
export RESTIC_REPOSITORY="sftp://172.23.157.2//srv/dev-disk-by-label-data4/Backup/Restic/"
export RESTIC_REPOSITORY="sftp://172.23.157.2//srv/Data/Backup/Restic/Macbook"
export GCC_COLORS="error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01"

View file

@ -58,22 +58,26 @@ Host acs-villas
Host acs-buildbot
User svg
HostName 134.130.169.43
HostName 137.226.133.207
Host acs-buildbot-2
User root
HostName 137.226.133.208
Host acs-vm
User svg
HostName 134.130.169.46
Host acs-hyper1
User acs-admin
User root
HostName 137.226.133.191
Host acs-hyper2
User acs-admin
User root
HostName 137.226.133.192
Host acs-hyper3
User acs-admin
User root
HostName 137.226.133.193
Host acs-os-reserve
@ -107,6 +111,16 @@ Host acs-os-k8s-master
User ubuntu
ForwardAgent yes
Host villas-test
HostName 142.93.233.220
User root
ForwardAgent yes
Host tud-villas
HostName 10.10.12.20
User iepg
ForwardAgent yes
#
# Private
#
@ -117,6 +131,7 @@ Host *.0l.dn42
Host *.0l.de
ForwardAgent yes
RemoteForward 52698 127.0.0.1:52698
Host vog
User pi
@ -129,7 +144,7 @@ Host lian
ProxyJump nag
HostName 172.23.156.2
Host nag
Host nag.0l.de
User stv0g
ForwardAgent yes
HostName nag.0l.de