diff --git a/.remoteenv b/.remoteenv
index f3614bb..a80f1c4 100644
--- a/.remoteenv
+++ b/.remoteenv
@@ -27,5 +27,8 @@ else
 fi
 unset t1 t2 t3 flake_shell
 
-echo Entered "$(hostname --fqdn)"
-df -h /nix/store
+{
+  echo Entered "$(hostname --fqdn)"
+  df -h /nix/store
+  echo
+} >&2
diff --git a/justfile b/justfile
index 007ed15..57d4444 100644
--- a/justfile
+++ b/justfile
@@ -95,6 +95,16 @@ switch *_:
   sudo nixos-rebuild-ng switch --accept-flake-config --show-trace --flake . "$@"
 
 boot *_:
+  #!/usr/bin/env -S bash -euo pipefail
+  if [[ $# -ge 1 ]]; then
+    if [[ "${1:-}" = "" ]]; then
+      echo >&2 "WARNING: first arg was empty, popping it off..."
+      shift
+    elif [[ "${1::1}" != "-" ]]; then
+      echo >&2 "WARNING: first arg did not start with a "-", is it a hostname?"
+    fi
+  fi
+  set -x
   sudo nixos-rebuild-ng boot --accept-flake-config --show-trace --flake . "$@"
 
 boot-and-reboot *_:
diff --git a/users/pbsds/home/profiles/ssh.nix b/users/pbsds/home/profiles/ssh.nix
index f78a7dd..48ef32d 100644
--- a/users/pbsds/home/profiles/ssh.nix
+++ b/users/pbsds/home/profiles/ssh.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, ... }:
 {
 
   home.shellAliases.tssh = "ssh -t";
@@ -25,10 +25,12 @@
   programs.ssh.matchBlocks = {
     "*".serverAliveInterval = 10;
     "*".serverAliveCountMax = 3;
+    "*".setEnv."TERM" = "xterm-256color"; # why u do dis ghostty...
     "git.*".forwardX11 = false;
+    "gogs.*".forwardX11 = false;
     "gitea.*".forwardX11 = false;
     "github.com".forwardX11 = false;
-    "gogs.*".forwardX11 = false;
+    "gitlab.com".forwardX11 = false;
     "*.pbsds.net".forwardX11 = true;
     "*.pbsds.net".forwardX11Trusted = true;
     "*.tail9aac63.ts.net".forwardX11 = true;
@@ -55,7 +57,6 @@
     "sopp.pbsds.net".host = "sopp.tail9aac63.ts.net";
     "noximilien.pbsds.net".host = "noximilien.tail9aac63.ts.net";
     "rocm.pbsds.net".host = "rocm.tail9aac63.ts.net";
-    "rocm.pbsds.net".setEnv."TERM" = "xterm-256color";
     "furiphoneflx1.pbsds.net".user = "furios";
     "furiphoneflx1.pbsds.net".host = "furiphoneflx1.tail9aac63.ts.net";