Compare commits

..

4 commits

6 changed files with 40 additions and 51 deletions

View file

@ -1,3 +1,10 @@
function bwunlock 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 end

View file

@ -1,11 +1,5 @@
function chezmoiapply function chezmoiapply
set -x NODE_OPTIONS "--no-deprecation" set -x NODE_OPTIONS "--no-deprecation"
bwunlock
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 chezmoi apply
end end

View file

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

View file

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

View file

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

View file

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