macbook more managed

.envrc

@@ -1,31 +1,5 @@
 #!/usr/bin/env bash
 
-if test -f .venv/bin/python && test "$(realpath .venv/bin/python)" != "$(realpath "$(pyenv which python)")"
-then
-  echo "rebuilding venv für new python version"
-  rm -rf .venv
-fi
-
-python3 -m venv .venv
-source .venv/bin/activate
-PATH_add .venv/bin
-PATH_add bin
-python3 -m pip --require-virtualenv --quiet install --upgrade pip wheel
-python3 -m pip --require-virtualenv --quiet install --upgrade -r requirements.txt
-
-# git deploy cache
-export BW_GIT_DEPLOY_CACHE=".cache/bw/git_deploy"
-CREATED_AT=$(stat -f "%Sa" "$BW_GIT_DEPLOY_CACHE" | xargs -I{} date -f '%b %d %H:%M:%S %Y' -j "{}" '+%s')
-NOW_AT=$(date +%s)
-SECONDS_SINCE=$(expr "$NOW_AT" - "$CREATED_AT")
-if [[ "$SECONDS_SINCE" > 86400 ]]
-then
-  rm -rf "$BW_GIT_DEPLOY_CACHE"
-fi
-mkdir -p "$BW_GIT_DEPLOY_CACHE"
-
-export EXPERIMENTAL_UPLOAD_VIA_CAT=1
-export BW_ITEM_WORKERS=32
-export BW_NODE_WORKERS=12
-export DISK_CACHE_DIR=.cache/cache_to_disk
-unset PS1
+source_env ~/.local/share/direnv/pyenv
+source_env ~/.local/share/direnv/venv
+source_env ~/.local/share/direnv/bundlewrap

bundles/macbook/files/bundlewrap

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+cd "$OLDPWD"
+
+export BW_ITEM_WORKERS=$(expr $(nproc) '*' 2)
+export BW_NODE_WORKERS=$(expr 256 '/' "$BW_ITEM_WORKERS")

bundles/macbook/files/gnu

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+cd "$OLDPWD"
+
+GNU_PATH="$HOME/.local/gnu_bin"
+mkdir -p "$GNU_PATH"
+test -f "$GNU_PATH/sed" || ln -s "$(which gsed)" "$GNU_PATH/sed"
+PATH_add "$GNU_PATH"

bundles/macbook/files/pyenv

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+cd "$OLDPWD"
+
+if test -f .venv/bin/python && test "$(realpath .venv/bin/python)" != "$(realpath "$(pyenv which python)")"
+then
+  echo "rebuilding venv für new python version"
+  rm -rf .venv
+fi

bundles/macbook/files/venv

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+cd "$OLDPWD"
+
+python3 -m venv .venv
+source ./.venv/bin/activate
+PATH_add .venv/bin
+
+NOW=$(date +%s)
+if test -e .pip_upgrade_timestamp
+then
+  LAST=$(cat .pip_upgrade_timestamp)
+else
+  LAST=0
+fi
+DELTA=$(expr "$NOW" - "$LAST")
+echo "last pip upgrade $DELTA seconds ago"
+if test "$DELTA" -gt 86400
+then
+  python3 -m pip --require-virtualenv install pip wheel --upgrade
+  python3 -m pip --require-virtualenv install -r requirements.txt --upgrade
+  date +%s > .pip_upgrade_timestamp
+fi

bundles/macbook/files/zshrc

@@ -0,0 +1,28 @@
+export PATH=~/.bin:$PATH
+export ZSH=~/.zsh/oh-my-zsh
+ZSH_THEME="ckn"
+HIST_STAMPS="yyyy/mm/dd"
+plugins=(
+  zsh-autosuggestions
+  git
+)
+source $ZSH/oh-my-zsh.sh
+
+ulimit -S -n 24000
+
+sshn() {
+    ssh "$(tr '.' ' ' <<< "$1" | tac -s ' ' | xargs | tr ' ' '.').smhss.de"
+}
+pingn() {
+    ping "$(tr '.' ' ' <<< "$1" | tac -s ' ' | xargs | tr ' ' '.').smhss.de"
+}
+
+antivir() {
+    printf 'scanning for viruses' && sleep 1 && printf '.' && sleep 1 && printf '.' && sleep 1 && printf '.' &&
+sleep 1 && echo '\nyour computer is safe!'
+}
+
+eval "$(rbenv init -)"
+eval "$(pyenv init -)"
+eval "$(direnv hook zsh)"
+eval "$(op completion zsh)"; compdef _op op

bundles/macbook/items.py

@@ -1,9 +1,26 @@
 directories['/Users/mwiegand/.config/bundlewrap/lock'] = {}
 
+# home
+
+files['/Users/mwiegand/.zshrc'] = {
+    'source': 'zshrc',
+    'mode': '0644',
+}
+
+# updater
+
 files['/Users/mwiegand/.bin/macbook-update'] = {
     'mode': '755',
 }
 
+# direnv
+
+directories['/Users/mwiegand/.local/share/direnv'] = {}
+files['/Users/mwiegand/.local/share/direnv/gnu'] = {}
+files['/Users/mwiegand/.local/share/direnv/pyenv'] = {}
+files['/Users/mwiegand/.local/share/direnv/venv'] = {}
+files['/Users/mwiegand/.local/share/direnv/bundlewrap'] = {}
+
 ##################
 
 for element in [*files.values(), *directories.values()]: