diff --git a/.gitconfig.base b/.gitconfig.base
index 8a1430e1..2724a44e 100644
--- a/.gitconfig.base
+++ b/.gitconfig.base
@@ -40,6 +40,7 @@
 	am = commit --amend --no-edit
 	ama = commit --amend --no-edit -a
 	b = branch
+	bi = bisect
 	bnew = checkout -b
 	ci = commit
 	cia = commit --amend
diff --git a/.vscode-mac.keybindings.json b/.vscode-mac.keybindings.json
index 9cd4dd40..172c8d12 100644
--- a/.vscode-mac.keybindings.json
+++ b/.vscode-mac.keybindings.json
@@ -396,5 +396,9 @@
   {
     "key": "ctrl+cmd+r",
     "command": "typescript.restartTsServer"
+  },
+  {
+    "key": "ctrl+shift+cmd+o",
+    "command": "git.closeAllUnmodifiedEditors"
   }
 ]
diff --git a/.vscode-mac.settings.json b/.vscode-mac.settings.json
index cd562633..bb23bbca 100644
--- a/.vscode-mac.settings.json
+++ b/.vscode-mac.settings.json
@@ -93,7 +93,7 @@
   "rest-client.fontSize": 13,
   "scrolloff.scrolloff": 10,
   "search.exclude": {
-    "**/*.{png,jpeg,jpg,svg}": true,
+    "**/*.{png,jpeg,jpg}": true,
     "**/*.js.snap": true,
     "**/*.ts.snap": true,
     "**/yaml.lock": true
@@ -168,7 +168,7 @@
   "git.openRepositoryInParentFolders": "never",
   "editor.showFoldingControls": "never",
   "editor.guides.indentation": false,
-  "editor.lineNumbers": "off",
+  "editor.lineNumbers": "on",
   "update.showReleaseNotes": false,
   "editor.fontSize": 15,
   "explorer.autoRevealExclude": {
@@ -216,5 +216,6 @@
   "window.density.editorTabHeight": "compact",
   "typescript.tsserver.maxTsServerMemory": 15000,
   "typescript.tsserver.log": "off",
-  "typescript.tsserver.web.typeAcquisition.enabled": false
+  "typescript.tsserver.web.typeAcquisition.enabled": false,
+  "terminal.integrated.scrollback": 100000
 }
diff --git a/.zshrc b/.zshrc
index 25018612..20141647 100644
--- a/.zshrc
+++ b/.zshrc
@@ -115,6 +115,7 @@ alias aag='agg'
 alias agg='_agg () { rg --group $@ | less }; _agg'
 alias aurl='adb shell am start -a "android.intent.action.VIEW" -d'
 alias bc='bc -l'
+alias co-='git checkout -'
 alias com='git checkout main'
 alias cr2lf="perl -pi -e 's/\x0d/\x0a/gs'"
 alias curlheaders='curl -s -D- -o/dev/null'
@@ -140,6 +141,7 @@ alias gap='clear; git add --all --patch'
 alias gb='git branch'
 alias gbd='git branch -d'
 alias gbl='git branch -v -a'
+alias gc-='git checkout -'
 alias gca='git commit --amend'
 alias gcane='git commit --amend --no-edit'
 alias gcanes='gcane --gpg-sign'
@@ -157,6 +159,7 @@ alias gdw='git diff -w'
 alias gf='git fetch'
 alias gfa='git fetch --all'
 alias gfix='git rebase -i HEAD~10'
+alias gfix2='git rebase -i HEAD~30'
 alias gfixup='git rebase -i HEAD~10'
 alias gfrb='git fetch && git rebase origin/main'
 alias gfrbc='grbc'