Merge branch 'master' of cgit.shore.co.il:/srv/git/rcfiles

.bash_completion.d/kops

+command -v kops >/dev/null && eval $(kops completion bash)

.bash_completion.d/kubectl

+command -v kubectl >/dev/null && eval $(kubectl completion bash)

.bash_completion.d/minikube

+command -v minikube >/dev/null && eval $(minikube completion bash)

.bash_completion.d/packer

+! command -v packer >/dev/null || complete -C packer packer

.bash_completion.d/pandoc

+command -v pandoc > /dev/null && pandoc --bash-completion > /dev/null && eval $( pandoc --bash-completion )

.bash_completion.d/pipenv

+command -v pipenv > /dev/null || eval $(pipenv --completion)

.bash_completion.d/terraform

+! command -v terraform >/dev/null || complete -C terraform terraform

.bash_completion.d/vault

+! command -v vault >/dev/null || complete -C vault vault

.bashrc

@@ -55,7 +55,6 @@ alias deborphan='deborphan -a --no-show-section --ignore-suggests'
 alias aptitude='aptitude --display-format %p --quiet'
 alias obsolete='aptitude search ?obsolete'
 alias missing-recommends="aptitude search '~RBrecommends:~i'"
-alias missing-suggests="aptitude search '~RBsuggests:~i'"
 # shellcheck disable=SC2142
 alias deinstalled="dpkg --get-selections | awk '\$2==\"deinstall\" {print \$1}'"
 alias ansible-local='ansible localhost -c local -i localhost,'
@@ -67,7 +66,7 @@ alias hostlocal='docker run --rm --privileged --net=host gliderlabs/hostlocal'
 alias cadvisor='docker run --rm   --volume=/:/rootfs:ro --volume=/var/run:/var/run:rw --volume=/sys:/sys:ro --volume=/var/lib/docker/:/var/lib/docker:ro --volume=/dev/disk/:/dev/disk:ro --publish=8080:8080 --detach=true --name=cadvisor google/cadvisor:latest'
 alias __apt-daily="sudo /bin/sh -c 'apt-get update && apt-get dist-upgrade --download-only --yes && apt-get autoclean'"
 alias apt-daily="monitor __apt-daily"
-alias __flatpak-daily="sudo /bin/sh -c 'flatpak update --assumeyes && flatpak uninstall --unused --assumeyes'"
+alias __flatpak-daily='sudo flatpak update --assumeyes'
 alias flatpak-daily="monitor __flatpak-daily"
 alias cdtemp='cd $(mktemp -d)'
 alias 0-day-cleanup='ssh xbmc.shore.co.il "sudo -u debian-transmission find /srv/library/Comics -name *.part -path *0-Day\ Week\ of* -delete"'

.config/git/config

@@ -4,6 +4,7 @@
     amend = commit --amend
     autorebase = -c 'core.editor=true' rebase -i --autosquash --autostash
     bull = submodule update --remote --init
+    cdiff = diff --cached
     cleaan = clean -fdX
     cleaaan = clean -fdx
     dif = diff --color-words
@@ -41,6 +42,9 @@
 [fetch]
     fsckobjects = true
     prune = true
+[filter "ansible-vault"]
+    clean = ANSIBLE_VERBOSITY=0 ansible-vault encrypt
+    smudge = ANSIBLE_VERBOSITY=0 ansible-vault decrypt
 [grep]
     linenumber = true
 [merge]

pythonrc @ aa1e7d30

-Subproject commit d9f2c7a9caf0076c011bbe0aa42fca641432ea57
+Subproject commit aa1e7d3063d1b6f8dbee4cc65db25c642aea4edf

.githooks/post-merge

 #!/bin/sh
 set -eu
 cd "$(git rev-parse --show-toplevel)"
+echo Installing Golang apps >> /dev/stderr
+go get github.com/giantswarm/semver-bump || true
+go get github.com/nishanths/license || true
+echo Installing Python apps >> /dev/stderr
+python3 -m pip install --user --requirement requirements.txt
 echo Installing Git hooks >> /dev/stderr
 Documents/bin/install-git-hooks
 echo Generating SSH config >> /dev/stderr
@@ -9,7 +14,5 @@ echo Loading dconf config >> /dev/stderr
 Documents/bin/dconf-load
 echo Configuring Git repo >> /dev/stderr
 git config --local status.showUntrackedFiles no
-echo Creating Bash completion scripts >> /dev/stderr
-Documents/bin/gen-bash-completion
 echo Adding Cron job >> /dev/stderr
 Documents/bin/cron-jobs

.gitignore

 *
-.bash_completion.d/.pipenv
-.pre-commit/
-.ssh/config

.ssh/config.d/20_endless

+Host 172.31.*.* 10.*.*.* *.endlessm.com *.endlessm-sf.com endlessm.com
+User nimrod
+IdentityFile ~/.ssh/endless_ecdsa
+
+Host 10.17.*.* home.dev.endlessm.com
+ProxyCommand ssh vpn-router.uw1.endlessm.com -W %h:%p
+
+Host 172.31.*.* 10.*.*.* *.endlessm-sf.com
+UserKnownHostsFile /dev/null
+StrictHostKeyChecking no
+ProxyCommand ssh vpn-router.uw2.endlessm.com -W %h:%p
+
+Host appupdates.endlessm.com irc.endlessm.com status.endlessm.com
+Port 2200
+ProxyCommand ssh vpn-router.uw2.endlessm.com -W %h:%p
+
+Host vpn-router.sf.endlessm.com
+Port 2022

Documents/bin/__apt-daily

+#!/bin/sh
+exec sudo /bin/sh -c 'apt-get update && apt-get dist-upgrade --download-only --yes && apt-get autoclean'

Documents/bin/gen-bash-completion

-#!/bin/sh
-set -eu
-
-gen_completion () {
-    executable="$1"
-    ! command -v "$executable" > /dev/null || "$@" > "$HOME/.bash_completion.d/$executable"
-}
-
-gen_completion pandoc --bash-completion
-gen_completion pipenv --completion
-gen_completion kops completion bash
-gen_completion kubectl completion bash
-gen_completion minikube completion bash

Documents/bin/monitor

+#!/bin/sh
+set -eu
+
+if ! command -v notify-send > /dev/null
+then
+    notify="printf '\\a'"
+elif [ "$(whoami)" = "root" ] && [ -n "${SUDO_USER:-}" ]
+then
+    notify="sudo --preserve-env --set-home --user $SUDO_USER notify-send"
+else
+    notify='notify-send'
+fi
+
+eval "$@" || code="$?"
+code="${code:-0}"
+
+if [ "$code" -eq 0 ]
+then
+    $notify "$(basename "${1#__}") has finished."
+else
+    $notify --urgency=critical "$(basename "${1#__}") has failed."
+fi
+
+return "$code"

Documents/bin/sudome

+#!/bin/sh
+set -eu
+
+if command -v "$1" >/dev/null
+then
+    executable="$(command -v "$1")"
+    shift
+    exec sudo --preserve-env --set-home "$executable" "$@"
+else
+    exec sudo --preserve-env --set-home "$@"
+fi

requirements.txt

+ansible
+awscli
+awslogs
+#aws-shell
+bcrypt
+boto
+boto3
+docker-compose
+Glances
+gunicorn
+httpbin
+httpie
+khal
+khard
+mycli
+netaddr
+parse
+passlib
+pgcli
+pipenv
+piprot
+pre-commit
+pur
+pygments
+sh
+template
+todoman
+tox