remove blank lines in upgrade func

dot_config/fish/private_functions/private_ll.fish

@@ -1,3 +1,8 @@
 function ll --wraps=ls --wraps=eza
-eza --long --all --header --group --git $argv
+    set bin exa
+    if type -q eza
+        set bin eza
+    end
+
+    $bin --long --all --header --group --git $argv
 end

dot_config/fish/private_functions/upgrade.fish.tmpl

@@ -1,10 +1,13 @@
 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
 end

dot_config/topgrade.toml.tmpl

@@ -11,6 +11,9 @@ disable = [
     {{- if eq .chezmoi.os "darwin" }}
     "vim",
     {{- end }}
+    {{- if not (get . "sudo") }}
+    "npm",
+    {{- end }}
 ]
 
 # Ignore failures for these steps

dot_gnupg/gpg-agent.conf

@@ -1,2 +0,0 @@
-pinentry-program /opt/homebrew/bin/pinentry-mac
-

private_dot_gnupg/gpg-agent.conf.tmpl

@@ -0,0 +1,9 @@
+{{- if get . "brew" }}
+pinentry-program /opt/homebrew/bin/pinentry-mac
+{{- end }}
+
+default-cache-ttl 600
+max-cache-ttl 7200
+default-cache-ttl-ssh 600
+max-cache-ttl-ssh 7200
+