mirror of
https://github.com/shokinn/.files.git
synced 2026-03-09 20:17:02 +00:00
Add AGE encrypted vwrc and vwfunc files; update config and zsh files for integration
This commit is contained in:
parent
6056351673
commit
641b15f2c5
6 changed files with 105 additions and 79 deletions
|
|
@ -1,7 +1,7 @@
|
|||
#! /usr/bin/env sed 2,5!d;s/^#.//
|
||||
# This script must be sourced from within a shell
|
||||
# and not executed. For instance with:
|
||||
#
|
||||
#
|
||||
# . ~/.commonfunc
|
||||
|
||||
#
|
||||
|
|
@ -352,7 +352,7 @@ confv6() {
|
|||
if [[ -n ${prefixlength} ]]; then
|
||||
prefixlength=${(q+)prefixlength[-1]/=}
|
||||
fi
|
||||
|
||||
|
||||
if [[ -n ${router} ]]; then
|
||||
router=${(q+)router[-1]/=}
|
||||
fi
|
||||
|
|
@ -406,7 +406,7 @@ confv6() {
|
|||
fi
|
||||
|
||||
if [[ -z ${return_code} ]]; then
|
||||
|
||||
|
||||
return 5
|
||||
fi
|
||||
|
||||
|
|
@ -415,70 +415,4 @@ confv6() {
|
|||
return 5
|
||||
}
|
||||
|
||||
{%@@ endif @@%}{%@@ if vw == true @@%}
|
||||
setProxyEnv() {
|
||||
local HIGHLIGHT='\033[36;1m'
|
||||
local RESET='\033[0;0m'
|
||||
|
||||
local PROXY='127.0.0.1:9000'
|
||||
local PROXY_CFG_HTTP="${PROXY}"
|
||||
local PROXY_CFG_HTTPS="${PROXY}"
|
||||
local NO_PROXY_CFG="127.0.0.1,localhost,vw.vwg"
|
||||
|
||||
export NO_PROXY="${NO_PROXY_CFG}"
|
||||
export no_proxy="${NO_PROXY_CFG}"
|
||||
export HTTP_PROXY="${PROXY_CFG_HTTP}"
|
||||
export HTTPS_PROXY="${PROXY_CFG_HTTPS}"
|
||||
export http_proxy="${PROXY_CFG_HTTP}"
|
||||
export https_proxy="${PROXY_CFG_HTTPS}"
|
||||
export GIT_SSH_COMMAND='ssh -o ProxyCommand="/opt/homebrew/bin/corkscrew localhost 9000 %h %p"'
|
||||
|
||||
[[ -d "{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macsys/Data" ]] && local TAILSCALEPATH="{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macsys/Data/tailscaled-env.txt" || true
|
||||
[[ -d "{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macos.network-extension/Data" ]] && local TAILSCALEPATH="{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macos.network-extension/Data/tailscaled-env.txt" || true
|
||||
[[ -d "/etc/tailscale" ]] && local TAILSCALEPATH="/etc/tailscale/tailscaled-env.txt" || true
|
||||
if [[ -n ${TAILSCALEPATH} ]]; then
|
||||
cat <<EOF > "${TAILSCALEPATH}"
|
||||
NO_PROXY="${NO_PROXY_CFG}"
|
||||
no_proxy="${NO_PROXY_CFG}"
|
||||
HTTP_PROXY="${PROXY_CFG_HTTP}"
|
||||
HTTPS_PROXY="${PROXY_CFG_HTTPS}"
|
||||
http_proxy="${PROXY_CFG_HTTP}"
|
||||
https_proxy="${PROXY_CFG_HTTPS}"
|
||||
|
||||
EOF
|
||||
fi
|
||||
|
||||
echo -e "\n✈️ exported zscaler proxy: ${HIGHLIGHT}http://${PROXY}${RESET}"
|
||||
}
|
||||
|
||||
unsetProxyEnv() {
|
||||
unset NO_PROXY
|
||||
unset HTTP_PROXY
|
||||
unset HTTPS_PROXY
|
||||
unset no_proxy
|
||||
unset http_proxy
|
||||
unset https_proxy
|
||||
unset GIT_SSH_COMMAND
|
||||
|
||||
[[ -d "{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macsys/Data" ]] && local TAILSCALEPATH="{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macsys/Data/tailscaled-env.txt" || true
|
||||
[[ -d "{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macos.network-extension/Data" ]] && local TAILSCALEPATH="{{@@ env['HOME'] @@}}/Library/Containers/io.tailscale.ipn.macos.network-extension/Data/tailscaled-env.txt" || true
|
||||
[[ -d "/etc/tailscale" ]] && local TAILSCALEPATH="/etc/tailscale/tailscaled-env.txt" || true
|
||||
|
||||
if [[ -n ${TAILSCALEPATH} ]]; then
|
||||
rm "${TAILSCALEPATH}"
|
||||
fi
|
||||
|
||||
echo -e "\n🔄 removed zscaler proxy cofiguration"
|
||||
}
|
||||
|
||||
setVpnGitRemote() {
|
||||
local ORIGIN=vpn #e.g.
|
||||
local HIGHLIGHT='\033[36;1m'
|
||||
local RESET='\033[0;0m'
|
||||
|
||||
local repo="ssh://git@vpn.github.com:443/${$(git config remote.origin.url)#*git@github.com:}"
|
||||
git remote add ${ORIGIN} "${repo}" 2> /dev/null
|
||||
|
||||
echo -e "🔗 git remote (${HIGHLIGHT}${ORIGIN}${RESET}): ${HIGHLIGHT}${repo}${RESET}\n"
|
||||
}
|
||||
{%@@ endif @@%}
|
||||
|
|
|
|||
65
dotfiles/vwfunc.age
Normal file
65
dotfiles/vwfunc.age
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTcXpVeEVCK3RSOGh6NE80
|
||||
ZmRTZzVtOHUrcGNac09nMGk3VmRPNEtxOVQ4ClAwRFdGZDJqR1BDRmZNZnVOYWNn
|
||||
Nk9Yc1FZaFQvVW8rU0xROGVHWXdsQTQKLS0tIHdLbG1pOXdsQ2NkK2FJVzZWOFhJ
|
||||
aXBxQTlvVWQwZ0dkMGZGREFHb3BxRkEKfQQ+Bazg0M/8X/suryTq2PhEzYdhI/PF
|
||||
0qNARCp/V53NTH/g+LYnEM54wpeiznGZ39PCnAOPcN/F4vcUT1mDgJtHQRIM4EH8
|
||||
1Ne88b7W1cXjHu6TPynJMQAroDcTA2SVEe8le9FGCCmzKf6jnzwvLOW9bDdiJckZ
|
||||
JMg2ejaNhhROCxbd4XVTNZsAR7dMZF1MvkDmOD33/WCRr53CvzOO1WgKp8xYRx70
|
||||
EMQt221d0t+vGRvMdfuYKgO2zhUSCLCTqU/2wAGYosK2/Nke1BErLn5mOh7rlWNT
|
||||
GPRLra2V4f0rtoBNKJEDxFx2OtO52Y1t0z7HLv6R+dh434BBKP/UqN18g2IiNGDW
|
||||
79jdue/BriD9NWcFgP3aaQIirIGsET9ssUvTsPYD/2HBoVmLEY76NAqfKDqk9KPZ
|
||||
7o/HonAaXxJYVGJ3p+EIeb+T/kH+TWx49nDuH/SlXFcTt81Zqh5uDxy19+50mIRz
|
||||
+1vUED0MaVtAxy0+AZTNU1P08rl5BLHzEcjvz46MelpyQebtm1qg4CZ9GZ3FfzMK
|
||||
bmLsGTTjag5vVQGww27jsM74rIcuKJsTLA7AjuRLzlT5ah1Wk/UXH4enRuvInAbH
|
||||
MqmaWh5vvD2AWgyllOOKGyVlEnBIzOs3t4ZtJiQqNbLx7t8WqWsL2kTWfF8SA5mF
|
||||
TLBDYJExILUhi9Wnwi7nW9UrYNgM9Nrv3HIwmodyXrLYswLBOBDn5vMuuqj5CwFu
|
||||
1dm8iISupT0Qg8QmmlG/hTapkcDqeYmKpuhmsy8XQLH8aKZVKZBgVWKxoNyj7esc
|
||||
wR3bfAyAKTPi7GRCbkZQ4NGIFUpkbZEvtfZzdqmuUu5FscQAQ3SoukQPW/UU19I1
|
||||
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
|
||||
0KpQHBsU
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
20
dotfiles/vwrc.age
Normal file
20
dotfiles/vwrc.age
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3MGVud2tObkl1WmJ6QTR2
|
||||
WXlBc0pJOFFlbTVIMldvMnBocGQvb3dXMEE4ClNWMUZsU001M3NtMUM5K1BVYmVH
|
||||
bEJMZWxIcFhuczF0MXJJMWJpclRmKzgKLS0tIDcvU1M5MnlreGxUSnJPMzEyckh1
|
||||
cXZzVm5XdFFEZ3JKTWMwc2U3Q3dsNmsKIURqQMrbREfGqNgu2TLd6nRC1xYkr449
|
||||
7U6m/ICXpvee7lPGSPveOG3sJg354PI5hmFK3gq54KhxS8Tr8jTrPNk1Yndue2hs
|
||||
QvfvDBlcJgE2dXvk1C77roSonP/urE/jW+AB76gKno025cBuqh+TKD7sZ2XfZfMX
|
||||
FTgitRMhs8GHTx0cB/MB3vcdjQhjFE5RA2wvPuTauylwSv3uxTXbLpL4YDWw01d9
|
||||
wR0v7lOz66VONQbwleZUaWsLPc9CgCI/wlPMqE3NOIbTdt+QdDA3As/kcsTrS8QD
|
||||
ugPpOin+8QG6+NV9HP+vANiwmnFxk+xIv3gSg1bqn6abAh5D2PVllmEZZW94KYGx
|
||||
VKEAlOgHX7zfWlSKUQVZJDBC+X+uBTzXArWNDshz7WmWxrjMtw63Q1PQCwGO6/Wf
|
||||
vvs+mDD/NRHPdGhcFmZGtjL6GHDTDqtmy6zpFtUqqSB+UL81B0kU7gyl5OTeevnG
|
||||
Fn/AMNH2Tor7SzqD6VdBylWzkUqBmUE40agezFTUF1KWdW5HhrHb30HM887WiqAi
|
||||
oEJK9s58M00VrP3fbPoSkM2w5R5Mjw/3gLRFj1mQRcgRmt0FWiN7PWvarI7/bdAn
|
||||
TC4oGh6s0sWdS+HP0N7KG1R9WQz7xjN1no6z6V4WABFHxLmMvYC/8g1Q8AaWWapi
|
||||
iZpMY4E2HB5gh7m1kKn+zt5FE+DYnw2HYHiJFa1dkFSw3hgjuMlsci1yoA9+7tfI
|
||||
Eb252I4tOTO5sOUWJAWDyhtNi6qKRzxSMFrLn9owZqyLgAXdBXeXQUd44gn9vOJY
|
||||
7S650LFiCXrr0Li7oCSeolfwLAMQE2NwxXr3I5wZnXTzk/V0sccOPZ812GmNuTEu
|
||||
3TLfYQuqRJZv3v0Vnmz0UMrbdo1wgiiqY/j0oZckECJHkSjKcfk=
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
|
|
@ -52,3 +52,4 @@ export HOMEBREW_CASK_OPTS="--appdir={{@@ env['HOME'] @@}}/Applications"
|
|||
{%@@ endif @@%}
|
||||
|
||||
source {{@@ env['HOME'] @@}}/.commonfunc
|
||||
{%@@ if vw == true @@%}source {{@@ env['HOME'] @@}}/.vwfunc{%@@ endif @@%}
|
||||
|
|
|
|||
|
|
@ -224,6 +224,8 @@ test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell
|
|||
|
||||
# Functions (or more complex aliases)
|
||||
source {{@@ env['HOME'] @@}}/.commonfunc
|
||||
{%@@ if vw == true @@%}source {{@@ env['HOME'] @@}}/.vwfunc
|
||||
source {{@@ env['HOME'] @@}}/.vwrc{%@@ endif @@%}
|
||||
|
||||
{%@@ if profile == 'ymir' @@%}
|
||||
autoload -Uz compinit
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue