diff --git a/home/.bash_aliases b/home/.bash_aliases index bf84d7e..ae66262 100644 --- a/home/.bash_aliases +++ b/home/.bash_aliases @@ -15,6 +15,7 @@ alias psa='ps aux' alias psag='ps aux | grep' alias ka=killall +alias s=sudo alias g=git alias k=kubectl alias a=ansible @@ -22,17 +23,10 @@ alias c=code alias e=$EDITOR alias h=helm alias d=docker +alias r=rancher +alias n="c ~/workspace/notes" # Some shortcuts for me -function moby() { - [ -f ~/.bash_env ] && source ~/.bash_env - - MACHINE=${1:-"default"} - - docker-machine start $MACHINE - eval $(docker-machine env $MACHINE) -} - function jumphost() { DEST=$1 @@ -113,7 +107,7 @@ function oath() { alias acs-pass='PASSWORD_STORE_DIR=~/workspace/rwth/acs/lab/passwords pass' -alias chaos-family-invite='ssh -t ssb.vm.0l.de sudo /root/sbot invite.create 1 | jq -r . | pbcopy' +alias chaos-family-invite='kubectl --context=nulll --namespace=ssb exec svc/pub -- sbot invite.create 1 | jq -r . | pbcopy' alias new-mac=$'openssl rand -hex 6 | sed \'s/\(..\)/\1:/g; s/.$//\' | xargs sudo ifconfig en0 ether' diff --git a/home/.bash_env b/home/.bash_env index 6beb9c0..327b96b 100644 --- a/home/.bash_env +++ b/home/.bash_env @@ -35,9 +35,17 @@ fi source ${HOME}/.cargo/env if type brew > /dev/null 2>&1; then - eval $(brew shellenv) + #eval $(brew shellenv) + #export PATH="$(brew --prefix coreutils)/libexec/gnubin:${PATH}" - export PATH="$(brew --prefix coreutils)/libexec/gnubin:${PATH}" + export HOMEBREW_PREFIX="/usr/local"; + export HOMEBREW_CELLAR="/usr/local/Cellar"; + export HOMEBREW_REPOSITORY="/usr/local/Homebrew"; + export PATH="/usr/local/bin:/usr/local/sbin${PATH+:$PATH}"; + export MANPATH="/usr/local/share/man${MANPATH+:$MANPATH}:"; + export INFOPATH="/usr/local/share/info${INFOPATH+:$INFOPATH}"; + + export PATH="/usr/local/opt/coreutils/libexec/gnubin:${PATH}" fi # OS X stuff if availabe @@ -60,9 +68,6 @@ fi export RESTIC_REPOSITORY="s3:http://moon.0l.de:9002/cam" -export AWS_ACCESS_KEY_ID=stv0g -export AWS_SECRET_ACCESS_KEY=m1n10Password - export GCC_COLORS="error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01" export DEBEMAIL="post@steffenvogel.de" @@ -74,7 +79,7 @@ export LANG=en_US.UTF-8 export GRC_BLOCKS_PATH=/usr/local/share/gnuradio/grc/blocks/ export CALICO_DATASTORE_TYPE=kubernetes -export CALICO_KUBECONFIG=~/.kube/config +export CALICO_KUBECONFIG=~/.kube/config.d/nulll function join_by { local IFS="$1"; shift; echo "$*"; } diff --git a/home/.ssh/config b/home/.ssh/config index d0fc803..5279478 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,9 +1,17 @@ CanonicalizeHostname yes -CanonicalDomains 0l.de rwth-aachen.de eonerc.rwth-aachen.de acs-lab.eonerc.rwth-aachen.de +CanonicalDomains home.0l.de int.0l.de 0l.de rwth-aachen.de eonerc.rwth-aachen.de acs-lab.eonerc.rwth-aachen.de # PKCS11Provider /usr/lib/ssh-keychain.dylib # Uni +Host *.rwth-aachen.de + ForwardAgent yes + +Host deploy1-jh.itc.rwth-aachen.de + User root + +Host *.k8s.jupyter.rwth-aachen.de + User jupyter # ACS # Autocompletion diff --git a/iterm2/com.googlecode.iterm2.plist b/iterm2/com.googlecode.iterm2.plist index c8bccc0..c5c572b 100644 --- a/iterm2/com.googlecode.iterm2.plist +++ b/iterm2/com.googlecode.iterm2.plist @@ -4,6 +4,8 @@ AppleAntiAliasingThreshold 1 + ApplePressAndHoldEnabled + AppleScrollAnimationEnabled 0 AppleSmoothFixedFontsSizeThreshold @@ -13,7 +15,7 @@ AutoHideTmuxClientSession CheckTestRelease - + ClosingTmuxTabKillsTmuxWindows ClosingTmuxTabKillsTmuxWindows_selection @@ -477,7 +479,7 @@ NSWindow Frame ProfilesPanel 673 327 735 382 0 0 1440 877 NSWindow Frame SUUpdateAlert - 1410 768 620 392 0 0 3440 1417 + 410 363 620 392 0 0 1440 877 NSWindow Frame SessionsPreferences 311 228 606 469 0 0 1440 877 NSWindow Frame SharedPreferences @@ -485,7 +487,7 @@ NSWindow Frame UKCrashReporter 99 294 592 584 0 0 1440 878 NSWindow Frame iTerm Window 0 - 1450 427 570 496 0 0 3440 1417 + 21 0 1592 1417 0 0 3440 1417 NSWindow Frame iTerm Window 1 721 425 570 452 0 0 1440 877 NSWindow Frame iTerm Window 2 @@ -2652,18 +2654,20 @@ NoSyncAllAppVersions 3.3.8beta1 + 3.3.7beta4 3.3.7beta1 3.3.5beta2 3.3.2beta1 3.3.7beta3 + 3.3.8 3.3.1beta1 3.3.5beta1 3.3.3beta2 3.3.4beta1 - 3.3.7beta4 + 3.3.9 3.3.2beta2 - 3.2.9 3.3.0 + 3.2.9 NoSyncAutoBurialReveal @@ -2683,9 +2687,9 @@ NoSyncFrame_SharedPreferences screenFrame - {{0, 0}, {3440, 1440}} + {{0, 0}, {1440, 900}} topLeft - {239, 899} + {269, 595} NoSyncHaveUsedCopyMode @@ -2700,7 +2704,7 @@ NoSyncInstallationId 62B6F5EC-6B86-4DA5-9A8C-EF123D1F7B3F NoSyncLaunchExperienceControllerRunCount - 65 + 106 NoSyncNeverRemindPrefsChangesLostForFile NoSyncNeverRemindPrefsChangesLostForFile_selection @@ -3578,13 +3582,15 @@ SUFeedAlternateAppNameKey iTerm SUFeedURL - https://iterm2.com/appcasts/testing_new.xml?shard=77 + https://iterm2.com/appcasts/final_new.xml?shard=77 SUHasLaunchedBefore SULastCheckTime - 2019-12-03T20:09:18Z + 2020-03-30T14:17:27Z SUSendProfileInfo + SUUpdateGroupIdentifier + 1115743071 SUUpdateRelaunchingMarker SavePasteHistory @@ -3631,7 +3637,7 @@ UKCrashReporterLastCrashReportDate 1506309760 Use background pattern indicator - + UseMetal VisualIndicatorForEsc @@ -3647,7 +3653,7 @@ findRegex_iTerm iTerm Version - 3.3.8beta1 + 3.3.9 metalMaximizeThroughput