Compare commits

...

4 commits

6 changed files with 40 additions and 51 deletions

View file

@ -1,3 +1,10 @@
function bwunlock
set -g BW_SESSION (bw login --raw)
set -x NODE_OPTIONS "--no-deprecation"
if not bw login --check
set -gx BW_SESSION (bw login --raw)
end
if not bw unlock --check
set -gx BW_SESSION (bw unlock --raw)
end
end

View file

@ -1,11 +1,5 @@
function chezmoiapply
set -x NODE_OPTIONS "--no-deprecation"
if not bw login --check
set -x BW_SESSION (bw login --raw)
end
if not bw unlock --check
set -x BW_SESSION (bw unlock --raw)
end
chezmoi apply
set -x NODE_OPTIONS "--no-deprecation"
bwunlock
chezmoi apply
end

View file

@ -1,10 +1,5 @@
function chezmoiupdate
set -x NODE_OPTIONS "--no-deprecation"
if not bw login --check
set -x BW_SESSION (bw login --raw)
end
if not bw unlock --check
set -x BW_SESSION (bw unlock --raw)
end
chezmoi update
set -x NODE_OPTIONS "--no-deprecation"
bwunlock
chezmoi update
end

View file

@ -1,23 +1,19 @@
function fetchkeys
if not bw login --check
set -x BW_SESSION (bw login --raw)
end
if not bw unlock --check
set -x BW_SESSION (bw unlock --raw)
end
set key_item (bw list items --search "SSH Main" | jq ".[0]" --raw-output)
set key_item_id (echo $key_item | jq ".id" --raw-output)
set key1 (echo $key_item | jq ".attachments[0]" --raw-output)
set key1_name (echo $key1 | jq ".fileName" --raw-output)
set key1_id (echo $key1 | jq ".id" --raw-output)
set key2 (echo $key_item | jq ".attachments[1]" --raw-output)
set key2_name (echo $key2 | jq ".fileName" --raw-output)
set key2_id (echo $key2 | jq ".id" --raw-output)
bw get attachment $key1_id --output "./$key1_name" --itemid $key_item_id
bw get attachment $key2_id --output "./$key2_name" --itemid $key_item_id
if string match -q -- '*.pub' $key1_name
chmod 600 $key2_name
else
chmod 600 $key1_name
end
set -x NODE_OPTIONS "--no-deprecation"
bwunlock
set key_item (bw list items --search "SSH Main" | jq ".[0]" --raw-output)
set key_item_id (echo $key_item | jq ".id" --raw-output)
set key1 (echo $key_item | jq ".attachments[0]" --raw-output)
set key1_name (echo $key1 | jq ".fileName" --raw-output)
set key1_id (echo $key1 | jq ".id" --raw-output)
set key2 (echo $key_item | jq ".attachments[1]" --raw-output)
set key2_name (echo $key2 | jq ".fileName" --raw-output)
set key2_id (echo $key2 | jq ".id" --raw-output)
bw get attachment $key1_id --output "./$key1_name" --itemid $key_item_id
bw get attachment $key2_id --output "./$key2_name" --itemid $key_item_id
if string match -q -- '*.pub' $key1_name
chmod 600 $key2_name
else
chmod 600 $key1_name
end
end

View file

@ -1,13 +1,8 @@
function upgrade --wraps=topgrade
set -x NODE_OPTIONS "--no-deprecation"
if not bw login --check
set -x BW_SESSION (bw login --raw)
end
if not bw unlock --check
set -x BW_SESSION (bw unlock --raw)
end
{{- if get . "sudo" }}
sudo ls >/dev/null
{{- end }}
topgrade $argv
set -x NODE_OPTIONS "--no-deprecation"
bwunlock
{{- if get . "sudo" }}
sudo ls >/dev/null
{{- end }}
topgrade $argv
end

View file

@ -8,11 +8,13 @@
disable = [
"mas",
"pip3",
"gem",
"ruby_gems",
{{- if eq .chezmoi.os "darwin" }}
"vim",
{{- end }}
{{- if not (get . "sudo") }}
"npm",
"node",
{{- end }}
]