Compare commits

...

20 commits

Author SHA1 Message Date
1d1c9b6490 do not use ssh proxyjump by default 2019-07-21 10:30:29 +02:00
a416a7b747 add acs-fedora-svg-2 ssh host 2019-07-21 10:30:02 +02:00
dfe346b6b1 add nrg5 ssh host 2019-07-21 10:29:44 +02:00
6bd774fd16 add rck ssh host 2019-07-21 10:29:34 +02:00
768aa1f1b4 update bash env for Homebrew 2019-07-21 10:29:16 +02:00
e98fd9c623 add villas-hub ssh host 2019-07-21 10:29:00 +02:00
fdcb158824 update buildbot ssh hosts 2019-07-21 10:28:46 +02:00
947130f0c6 update restic password 2019-07-21 10:28:27 +02:00
786f161ac6 update package script 2019-07-21 10:27:57 +02:00
72d28f638a use vscode as diff/merge tool for stree 2019-07-21 10:25:39 +02:00
80f3d00a3a update iTerm2 config 2019-07-21 10:13:13 +02:00
e850ec8d09 update EDITOR variable 2019-07-21 10:12:04 +02:00
cd7ca66202 remove duplicated homeshick include 2019-07-21 10:11:21 +02:00
3fd8197d59 remote ntfy support 2019-07-21 10:11:00 +02:00
4387b70a31 update bash aliases 2019-07-21 10:08:15 +02:00
988a8dc597 use homebrew bash completions 2019-07-21 10:07:58 +02:00
93c7ac6cbb add tmux config 2019-07-21 10:07:28 +02:00
d49a059b1e add ERIGrid ssh hosts 2019-07-21 10:06:14 +02:00
43694bed09 remove obsolete ssh hosts 2019-07-21 10:05:22 +02:00
c15a09ad9b added acs-k8s to ssh config 2019-07-21 10:04:43 +02:00
9 changed files with 200 additions and 124 deletions

View file

@ -11,22 +11,15 @@ alias rm='rm -I'
alias mv='mv -i'
alias cp='cp -i'
alias dquilt='quilt --quiltrc=${HOME}/.quiltrc-dpkg'
# git Aliases
alias g=git
# I'd like to learn the vi keybinings
alias pico=vi
alias nano=vi
alias note=geeknote
alias psa='ps aux'
alias psag='ps aux | grep'
alias ka=killall
alias g=git
alias k=kubectl
alias code=vscodium
alias a=ansible
alias c=code-insiders
alias e=$EDITOR
# Some shortcuts for me
function moby() {
@ -106,7 +99,7 @@ function restic() {
local RESTIC=$(which restic)
# Start original restic executable with short-lived keys
RESTIC_PASSWORD="$(pass restic/b2)" \
RESTIC_PASSWORD="$(pass restic/macbook)" \
$RESTIC $@
}

View file

@ -6,14 +6,6 @@ if [ -d /usr/local/share/bash-completion/completions ]; then
source /usr/local/share/bash-completion/completions/*
fi
if [ -f /opt/local/etc/profile.d/bash_completion.sh ]; then
source /opt/local/etc/profile.d/bash_completion.sh
fi
if type aws_completer > /dev/null 2>&1; then
complete -C aws_completer aws
fi
if type ykman > /dev/null 2>&1; then
_ykman_completion() {
local IFS=$'
@ -38,14 +30,14 @@ if type ykman > /dev/null 2>&1; then
_ykman_completionetup;
fi
if type kubectl > /dev/null 2>&1; then
source <(/opt/local/bin/kubectl completion bash)
fi
if type helm > /dev/null 2>&1; then
source <(helm completion bash)
fi
if type doctl > /dev/null 2>&1; then
source <(doctl completion bash)
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

View file

@ -1,46 +1,35 @@
export GOPATH=~/build/go
source $HOME/.cargo/env
source ${HOME}/.cargo/env
if [ -d ~/bin ]; then
export PATH=$PATH:~/bin/scripts:~/bin
export PATH=${PATH}:~/bin/scripts:~/bin
fi
if [ -d $GOPATH/bin ]; then
export PATH=$GOPATH/bin:$PATH
if [ -d ~/.npm-global/bin ]; then
export PATH=${PATH}:~/.npm-global/bin/
fi
if [ -d ${GOPATH}/bin ]; then
export PATH=${GOPATH}/bin:${PATH}
fi
# OS X stuff if availabe
if [[ "$OSTYPE" == "darwin"* ]]; then
if [ -d /opt/local/bin ]; then
export PATH=/opt/local/bin:/opt/local/sbin:$PATH
fi
if [ -d /opt/local/libexec/gnubin ]; then
export PATH=/opt/local/libexec/gnubin:$PATH
fi
if [[ "${OSTYPE}" == "darwin"* ]]; then
# MacGPG2
if [ -d /usr/local/MacGPG2/bin/ ]; then
export PATH=/usr/local/MacGPG2/bin/:$PATH
export PATH=/usr/local/MacGPG2/bin/:${PATH}
fi
# Macports man-pages
if [ -d /opt/local/share/man ]; then
export MANPATH=/opt/local/share/man:$MANPATH
export MANPATH=/opt/local/share/man:${MANPATH}
fi
# Linux man-pages
if [ -d /opt/man-pages ]; then
export MANPATH=/opt/man-pages:$MANPATH
export MANPATH=/opt/man-pages:${MANPATH}
fi
# Python
for VER in 3.7 2.7; do
if [ -d /opt/local/Library/Frameworks/Python.framework/Versions/$VER/bin ]; then
export PATH=/opt/local/Library/Frameworks/Python.framework/Versions/$VER/bin:$PATH
fi
done
fi
if [ -r ~/.gpg-agent-info ]; then
@ -51,8 +40,8 @@ if [ -r ~/.gpg-agent-info ]; then
export SSH_AGENT_PID
fi
if [ -x /usr/local/bin/code ]; then
export EDITOR="/usr/local/bin/code -w"
if [ -x /usr/local/bin/code-insiders ]; then
export EDITOR="/usr/local/bin/code-insiders -w"
else
export EDITOR=vim
fi
@ -61,7 +50,6 @@ 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"
export EDITOR=vim
export DEBEMAIL="post@steffenvogel.de"
export DEBFULLNAME="Steffen Vogel"

View file

@ -23,14 +23,6 @@ HISTFILESIZE=99999999
# make less more friendly for non-text input files, see lesspipe(1)
if [ -x /usr/bin/lesspipe ]; then eval "$(lesspipe)"; fi
# ntfy
export AUTO_NTFY_DONE_LONGER_THAN=-L10
export AUTO_NTFY_DONE_UNFOCUSED_ONLY=-b
if [ -f /opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ntfy/shell_integration/bash-preexec.sh ]; then
source /opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ntfy/shell_integration/bash-preexec.sh
source /opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/ntfy/shell_integration/auto-ntfy-done.sh
fi
# Homeshick
source ~/.homesick/repos/homeshick/homeshick.sh
source ~/.homesick/repos/homeshick/completions/homeshick-completion.bash
@ -53,6 +45,3 @@ if hash dircolors 2>/dev/null; then
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
fi
source ~/.homesick/repos/homeshick/homeshick.sh
source ~/.homesick/repos/homeshick/completions/homeshick-completion.bash

View file

@ -40,10 +40,10 @@
autocorrect = 1
[difftool "sourcetree"]
cmd = /opt/local/bin/meld $LOCAL $REMOTE
cmd = code-insiders --diff --wait \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /opt/local/bin/meld $LOCAL $REMOTE
cmd = code-insiders -n --wait \"$MERGED\"
trustExitCode = true
[diff "xml"]

View file

@ -39,34 +39,59 @@ Host acs-*
Host *.os-cloud.eonerc.rwth-aachen.de
ForwardAgent yes
ProxyJump acs-stargate
# ProxyJump acs-stargate
# Load Balancer
Host lb-*.os-cloud.eonerc.rwth-aachen.de
User ubuntu
# Kubernetes
Host acs-k8s-master
User ubuntu
HostName 137.226.248.165
Host acs-k8s-node*
ProxyJump acs-k8s-master
Host acs-k8s-node1
User ubuntu
HostName kubernetes-1
Host acs-k8s-node2
User ubuntu
HostName kubernetes-2
Host acs-k8s-node3
User ubuntu
HostName kubernetes-3
Host acs-k8s-node4
User ubuntu
HostName kubernetes-4
Host acs-k8s-master-old
HostName 137.226.248.72
User ubuntu
Host acs-k8s-traefik
User ubuntu
HostName 137.226.248.149
Host acs-reserver
User svg
HostName 137.226.133.195
Host acs-os-openproject
User fedora
HostName 137.226.248.132
Host acs-villas
User svg
HostName acs-villas.eonerc.rwth-aachen.de
Host acs-buildbot
User svg
Host acs-mac-buildbot
User acs-admin
HostName 137.226.133.207
Host acs-buildbot-2
User root
HostName 137.226.133.208
Host acs-vm
Host acs-buildbot
User svg
HostName 134.130.169.46
HostName 137.226.133.208
Host acs-hyper1
User root
@ -80,10 +105,6 @@ Host acs-hyper3
User root
HostName 137.226.133.193
Host acs-os-reserve
User fedora
HostName 137.226.248.103
Host acs-os-villas
User svg
HostName 137.226.248.91
@ -92,6 +113,10 @@ Host acs-os-fein-website
User fedora
HostName 137.226.248.111
Host acs-fedora-svg-2
User svg
HostName 134.130.169.13
Host inl-villas
User root
HostName 141.221.118.93
@ -106,11 +131,6 @@ Host os.fein-aachen.org
ForwardAgent yes
ProxyJump acs-villas
Host acs-os-k8s-master
HostName 137.226.248.72
User ubuntu
ForwardAgent yes
Host villas-test
HostName 142.93.233.220
User root
@ -121,13 +141,33 @@ Host tud-villas
User iepg
ForwardAgent yes
Host dtu-villas
User thangu
ProxyJump villas-hub
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
Host villas-hub
User root
HostName hub.villas.fein-aachen.org
ForwardAgent yes
#
# Private
#
Host *.0l.dn42
ForwardAgent yes
ProxyJump nag
Host *.0l.de
ForwardAgent yes
@ -135,13 +175,16 @@ Host *.0l.de
Host vog
User pi
ProxyJump nag
ForwardAgent yes
HostName 172.23.156.9
Host rck
User rock64
ForwardAgent yes
HostName 172.23.157.3
Host lian
User stv0g
ProxyJump nag
HostName 172.23.156.2
Host nag.0l.de

28
home/.tmux.conf Normal file
View file

@ -0,0 +1,28 @@
set-option -g default-shell /bin/zsh
set-option -g default-terminal $TERM
set-option -g base-index 1
setw -g pane-base-index 1
setw -g window-status-format "#[fg=white]#[bg=blue] #I #[bg=blue]#[fg=white] #W "
setw -g window-status-current-format "#[bg=brightmagenta]#[fg=white] *#I #[fg=white,bold]#[bg=cyan] [#W] "
set -g pane-border-fg black
set -g pane-active-border-fg blue
set -g status-fg white
set -g status-bg blue
set -g status-left ''
set -g status-right '%a %m-%d %H:%M'
set -g mouse on
unbind C-b
set-option -g prefix C-a
bind-key C-a send-prefix
bind | split-window -h
bind \ split-window -h
bind - split-window -v
unbind '"'
unbind %
bind -n M-Left select-pane -L
bind -n M-Right select-pane -R
bind -n M-Up select-pane -U
bind -n M-Down select-pane -D
set -s escape-time 0
bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -selection clipboard -i"
bind-key -T copy-mode MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -selection clipboard -i"

View file

@ -388,10 +388,16 @@
<integer>2</integer>
<key>LoadPrefsFromCustomFolder</key>
<true/>
<key>NSFontPanelAttributes</key>
<string>1, 0</string>
<key>NSNavLastRootDirectory</key>
<string>~/.homesick/repos/base16-iterm2</string>
<string>~/Documents</string>
<key>NSNavLastUserSetHideExtensionButtonState</key>
<false/>
<key>NSNavPanelExpandedSizeForOpenMode</key>
<string>{1114, 448}</string>
<key>NSNavPanelExpandedSizeForSaveMode</key>
<string>{712, 448}</string>
<key>NSQuotedKeystrokeBinding</key>
<string></string>
<key>NSRepeatCountBinding</key>
@ -407,24 +413,24 @@
</array>
<key>NSTableView Columns v2 KeyBingingTable</key>
<data>
YnBsaXN0MDDUAQIDBAUGNjdYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoK4HCA8aGxwdHh8gJjAxMlUkbnVsbNIJCgsOWk5TLm9iamVjdHNWJGNsYXNzogwN
gAKACoAN0xAJChEVGVdOUy5rZXlzoxITFIADgASABaMWFxiABoAHgAiACVpJZGVudGlm
aWVyVVdpZHRoVkhpZGRlblEwI0BowAAAAAAACNIhIiMkWiRjbGFzc25hbWVYJGNsYXNz
ZXNcTlNEaWN0aW9uYXJ5oiMlWE5TT2JqZWN00xAJCicrGaMSExSAA4AEgAWjLC0YgAuA
DIAIgAlRMSNAdKGdsi0OVtIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP
TlNLZXllZEFyY2hpdmVy0Tg5VUFycmF5gAEACAARABoAIwAtADIANwBGAEwAUQBcAGMA
ZgBoAGoAbABzAHsAfwCBAIMAhQCJAIsAjQCPAJEAnACiAKkAqwC0ALUAugDFAM4A2wDe
AOcA7gDyAPQA9gD4APwA/gEAAQIBBAEGAQ8BFAEjAScBLwFBAUQBSgAAAAAAAAIBAAAA
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVVBcnJheYABrgsMEx4fICEiIyQqNDU2VSRu
dWxs0g0ODxJaTlMub2JqZWN0c1YkY2xhc3OiEBGAAoAKgA3TFA0OFRkdV05TLmtleXOj
FhcYgAOABIAFoxobHIAGgAeACIAJWklkZW50aWZpZXJVV2lkdGhWSGlkZGVuUTAjQGjA
AAAAAAAI0iUmJyhaJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiJylYTlNP
YmplY3TTFA0OKy8doxYXGIADgASABaMwMRyAC4AMgAiACVExI0B0oZ2yLQ5W0iUmNzhe
TlNNdXRhYmxlQXJyYXmjNzkpV05TQXJyYXkACAARABoAJAApADIANwBJAEwAUgBUAGMA
aQBuAHkAgACDAIUAhwCJAJAAmACcAJ4AoACiAKYAqACqAKwArgC5AL8AxgDIANEA0gDX
AOIA6wD4APsBBAELAQ8BEQETARUBGQEbAR0BHwEhASMBLAExAUABRAAAAAAAAAIBAAAA
AAAAADoAAAAAAAAAAAAAAAAAAAFM
</data>
<key>NSTableView Sort Ordering v2 KeyBingingTable</key>
<data>
YnBsaXN0MDDUAQIDBAUGFBVYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
AAGGoKMHCA1VJG51bGzSCQoLDFpOUy5vYmplY3RzViRjbGFzc6CAAtIODxARWiRjbGFz
c25hbWVYJGNsYXNzZXNeTlNNdXRhYmxlQXJyYXmjEBITV05TQXJyYXlYTlNPYmplY3Rf
EA9OU0tleWVkQXJjaGl2ZXLRFhdVQXJyYXmAAQgRGiMtMjc7QUZRWFlbYGt0g4ePmKqt
swAAAAAAAAEBAAAAAAAAABgAAAAAAAAAAAAAAAAAAAC1
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMS
AAGGoF8QD05TS2V5ZWRBcmNoaXZlctEICVVBcnJheYABowsMEVUkbnVsbNINDg8QWk5T
Lm9iamVjdHNWJGNsYXNzoIAC0hITFBVaJGNsYXNzbmFtZVgkY2xhc3Nlc15OU011dGFi
bGVBcnJheaMUFhdXTlNBcnJheVhOU09iamVjdAgRGiQpMjdJTFJUWF5jbnV2eH2IkaCk
rAAAAAAAAAEBAAAAAAAAABgAAAAAAAAAAAAAAAAAAAC1
</data>
<key>NSTableView Supports v2 KeyBingingTable</key>
<true/>
@ -433,22 +439,24 @@
<key>TB Is Shown</key>
<integer>1</integer>
</dict>
<key>NSWindow Frame NSFontPanel</key>
<string>606 120 830 459 0 0 1440 877 </string>
<key>NSWindow Frame ProfilesPanel</key>
<string>54 219 735 382 0 0 1440 878 </string>
<string>673 327 735 382 0 0 1440 877 </string>
<key>NSWindow Frame SUUpdateAlert</key>
<string>410 363 620 392 0 0 1440 877 </string>
<key>NSWindow Frame SessionsPreferences</key>
<string>302 231 599 521 0 0 1440 877 </string>
<string>311 228 606 469 0 0 1440 877 </string>
<key>NSWindow Frame SharedPreferences</key>
<string>158 246 796 486 0 0 1440 877 </string>
<string>158 166 796 486 0 0 1440 877 </string>
<key>NSWindow Frame UKCrashReporter</key>
<string>99 294 592 584 0 0 1440 878 </string>
<key>NSWindow Frame iTerm Window 0</key>
<string>1 0 1440 877 0 0 1440 877 </string>
<string>0 119 948 758 0 0 1440 877 </string>
<key>NSWindow Frame iTerm Window 1</key>
<string>721 425 570 452 0 0 1440 877 </string>
<key>NSWindow Frame iTerm Window 2</key>
<string>0 0 1440 878 0 0 1440 878 </string>
<string>0 425 570 452 0 0 1440 877 </string>
<key>NeverWarnAboutPossibleOverrides</key>
<true/>
<key>NeverWarnAboutPossibleOverrides_selection</key>
@ -1172,8 +1180,14 @@
<integer>0</integer>
<key>NoSyncPermissionToShowTip</key>
<false/>
<key>NoSyncSaveDocumentAsPathSet_saveDocumentAs:</key>
<true/>
<key>NoSyncSuppressClipboardAccessDeniedWarning</key>
<true/>
<key>NoSyncTimeOfFirstLaunchOfVersionWithTip</key>
<real>518372566.76529002</real>
<key>NoSyncTurnOffMouseReportingOnHostChange</key>
<true/>
<key>PMPrintingExpandedStateForPrint2</key>
<false/>
<key>PasteTabToStringTabStopSize</key>
@ -1224,9 +1238,11 @@
<key>SUHasLaunchedBefore</key>
<true/>
<key>SULastCheckTime</key>
<date>2018-10-30T21:43:15Z</date>
<date>2019-07-20T16:34:18Z</date>
<key>SUSendProfileInfo</key>
<false/>
<key>ShowFullScreenTabBar</key>
<false/>
<key>SplitPaneDimmingAmount</key>
<real>0.40545873397435894</real>
<key>SuppressRestartAnnouncement</key>
@ -1260,7 +1276,7 @@
<key>findRegex_iTerm</key>
<false/>
<key>iTerm Version</key>
<string>3.2.4</string>
<string>3.2.9</string>
<key>metalMaximizeThroughput</key>
<true/>
</dict>

View file

@ -8,7 +8,6 @@ apt-get purge \
nano
apt-get install \
ansible
autocutsel \
bind9-utils \
build-essential \
@ -21,20 +20,15 @@ apt-get install \
fonts-font-awesome \
gimp \
git \
git-gui \
gitk \
gnuplot
htop \
i3 \
inkscape \
libreoffice \
lynx \
meld \
nitrogen
nitrogen \
pavucontrol \
pidgin \
rxvt-unicode \
screen \
sshfs \
sudo \
@ -43,6 +37,39 @@ apt-get install \
texlive-luatex \
texlive-pdflatex
vim \
vlc \
xsel \
vlc
wget -O /etc/yum.repos.d/sumieri-sway.repo https://copr.fedorainfracloud.org/coprs/gumieri/sway/repo/fedora-30/gumieri-sway-fedora-30.repo
dnf install \
sway
pip3 install \
ansible
brew install \
automake \
bash-completion@2 \
boringtun \
amar1729/formulae/browserpass \
coreutils \
curl \
doctl \
gcc \
git \
graphviz \
htop \
kubernetes-cli \
pass \
protobuf \
pwgen \
radare2 \
restic \
ripgrep \
wget \
wireshark \
brew cask install \
meld