diff --git a/vscode/settings.json b/vscode/settings.json
index 4f60efc..5031c48 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -32,14 +32,13 @@
     "editor.fontSize": 14,
     "editor.fontLigatures": true,
     "editor.formatOnSaveTimeout": 1500,
-    "workbench.colorTheme": "Monokai",
     "window.zoomLevel": 1,
     "terminal.integrated.shell.windows": "C:\\WINDOWS\\System32\\cmd.exe",
     "C_Cpp.clang_format_fallbackStyle": "llvm",
     "latex-workshop.view.pdf.viewer": "tab",
     "glitch.token": "687fb628-3a2e-4405-9bfb-49fc51068fbb",
     "calva.paredit.defaultKeyMap": "original",
-    "interactive-smartlog.pull": "hg pull",
+    "interactive-smartlog.pull": "arc pull",
     "interactive-smartlog.fetch": "jf get",
     "[json]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -49,5 +48,33 @@
     },
     "[typescript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
+    },
+    "[cpp]": {
+        "editor.defaultFormatter": "nuclide.cpp"
+    },
+    "pyls.BuckFormatOnSave": true,
+    "pyls.formatAlreadyFormattedFilesOnSave": true,
+    "fb.ms-remote-connections.hosts": [
+        {
+            "hostname": "our.doty.sb.facebook.com",
+            "folders": [
+                "/data/users/doty/configerator/",
+                "/data/users/doty/configerator-dsi/",
+                "/data/users/doty/configerator-hg/",
+                "/data/users/doty/configerator-puma/",
+                "/data/users/doty/databee/",
+                "/data/users/doty/dataswarm-git/",
+                "/data/users/doty/dataswarm-hg/",
+                "/data/users/doty/fbsource/",
+                "/data/users/doty/jepsen/",
+                "/data/users/doty/mysql-schemas/",
+                "/data/users/doty/opsfiles-hg/",
+                "/data/users/doty/www-hg/",
+                "/data/users/doty/www/"
+            ]
+        }
+    ],
+    "terminal.integrated.shell.linux": "/usr/bin/fish",
+    "workbench.colorTheme": "Monokai",
+    "editor.suggestSelection": "first"
 }