dot_config/fish/private_functions/bwunlock.fish

@@ -1,10 +1,3 @@
 function bwunlock
-  set -x NODE_OPTIONS "--no-deprecation"
+set -g BW_SESSION (bw login --raw)
-
-  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

dot_config/fish/private_functions/chezmoiapply.fish

@@ -1,5 +1,11 @@
 function chezmoiapply
     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
 end

dot_config/fish/private_functions/chezmoiupdate.fish

@@ -1,5 +1,10 @@
 function chezmoiupdate
     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 update
 end

dot_config/fish/private_functions/private_fetchkeys.fish

@@ -1,6 +1,10 @@
 function fetchkeys
-  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
 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)

dot_config/fish/private_functions/upgrade.fish.tmpl

@@ -1,6 +1,11 @@
 function upgrade --wraps=topgrade
     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
     {{- if get . "sudo" }}
     sudo ls >/dev/null
     {{- end }}

dot_config/topgrade.toml.tmpl

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