Fix up some dotfiles stuff

5 files changed, 78 insertions, 28 deletions

diff --git a/context.json b/context.json
index be0b89b..681c7db 100644
--- a/context.json
+++ b/context.json
@@ -20,7 +20,7 @@
                     },
                     "mesg": {
                         "apps": ["com.tinyspeck.slackmacgap", "com.hnc.Discord", 
-                            "com.apple.mail", "org.whispersystems.signal-desktop"]
+                            "com.apple.mail", "org.whispersystems.signal-desktop", "com.microsoft.teams2"]
                     },
                     "call": {
                         "apps": ["com.amazon.Amazon-Chime"]
@@ -70,6 +70,46 @@
             },
             "features": {
                 "work_mode": true
+            },
+
+            "window_manager": {
+                "key": {
+                    "mod": "alt",
+                    "mov": "shift",
+                    "ed": "ctrl"
+                },
+                "workspaces": {
+                    "http": {
+                        "monitor": "1"
+                    },
+                    "mesg": {
+                        "monitor": "main"
+                    },
+                    "mgmt": {
+                        "monitor": "main"
+                    },
+                    "misc": {
+                        "monitor": "1"
+                    },
+                    "call": {
+                        "monitor": "main"
+                    },
+                    "txt": {
+                        "monitor": "3"
+                    },
+                    "term": {
+                        "monitor": "3"
+                    },
+                    "ctrl": {
+                        "monitor": "3"
+                    },
+                    "brn": {
+                        "monitor": "3"
+                    },
+                    "play": {
+                        "monitor": "main"
+                    }
+                }
             }
         },
         "armin": {
diff --git a/dots/aerospace/.aerospace.toml.j2 b/dots/aerospace/.aerospace.toml.j2
index b04ce6e..86c3043 100644
--- a/dots/aerospace/.aerospace.toml.j2
+++ b/dots/aerospace/.aerospace.toml.j2
@@ -12,8 +12,8 @@ exec-on-workspace-change = [
 
 on-focus-changed = [
   'move-mouse window-lazy-center',
-  'exec-and-forget /bin/bash -c /opt/homebrew/bin/sketchybar --trigger front_app_switched',
-  'exec-and-forget sketchybar --trigger update_windows'
+# 'exec-and-forget /bin/bash -c /opt/homebrew/bin/sketchybar --trigger front_app_switched',
+# 'exec-and-forget sketchybar --trigger update_windows'
 ]
 
 start-at-login = true
@@ -58,7 +58,7 @@ automatically-unhide-macos-hidden-apps = true
     inner.vertical =   8
     outer.left =       8
     outer.bottom =     8
-    outer.top =        58
+    outer.top =        [{ monitor."^built-in retina display$" = 38 }, 58]
     outer.right =      8
 
 [mode.main.binding]
diff --git a/dots/mise/.config/mise/config.toml b/dots/mise/.config/mise/config.toml
index 7d382a3..5659af5 100644
--- a/dots/mise/.config/mise/config.toml
+++ b/dots/mise/.config/mise/config.toml
@@ -3,3 +3,4 @@ node = "lts"
 python = "3.12"
 deno = "2.3.3"
 java = "21"
+ruby = "3.4"
diff --git a/dots/sketchybar/.config/sketchybar/bar.lua b/dots/sketchybar/.config/sketchybar/bar.lua
index 2eea723..c701175 100644
--- a/dots/sketchybar/.config/sketchybar/bar.lua
+++ b/dots/sketchybar/.config/sketchybar/bar.lua
@@ -10,6 +10,6 @@ sbar.bar({
 	margin = settings.dimens.padding.bar,
 	corner_radius = settings.dimens.graphics.background.corner_radius,
 	y_offset = settings.dimens.graphics.bar.offset,
-	-- blur_radius = settings.dimens.graphics.blur_radius,
+	blur_radius = settings.dimens.graphics.blur_radius,
 	border_width = 0,
 })
diff --git a/dots/zed/.config/zed/settings.json.j2 b/dots/zed/.config/zed/settings.json.j2
index cc0ae85..f84b939 100644
--- a/dots/zed/.config/zed/settings.json.j2
+++ b/dots/zed/.config/zed/settings.json.j2
@@ -76,6 +76,15 @@
 
     // -- <languages> --
     "lsp": {
+        "kotlin-language-server": {
+            "settings": {
+                "compiler": {
+                    "jvm": {
+                        "target": "17"
+                    }
+                }
+            }
+        },
         "jdtls": {
             "initialization_options": {
                 "settings": {
@@ -99,6 +108,10 @@
             "format_on_save": "off",
             "language_servers": ["jdtls"]
         },
+        "kotlin": {
+            "format_on_save": "off",
+            "language_servers": ["kotlin-lsp"]
+        },
         "TypeScript": {
             "language_servers": ["typescript-language-server"],
             "formatter": "prettier"
@@ -146,36 +159,33 @@
     "context_servers": {
         // wasabi's MCP server
         "wasabi": {
-            "command": {
-                "path": "wasabi",
-                "args": ["--mcp-server"],
-                "env": null
-            },
+            "source": "custom",
+            "command": "wasabi",
+            "args": ["--mcp-server"],
+            "env": null,
             "settings": {}
         },
         // the internal general MCP server
         "Amazon Internal MCP": {
-            "command": {
-                "path": "amzn_ai-mcp",
-                "args": [],
-                "env": null
-            },
+            "source": "custom",
+            "command": "amzn_ai-mcp",
+            "args": [],
+            "env": null,
             "settings": {}
         },
         // offical AWS Docs MCP server built by Labs
         "AWS Documentation MCP Server": {
-            "command": {
-                "path": "mise",
-                "args": [
-                    "exec",
-                    "uv@latest",
-                    "--",
-                    "uvx",
-                    "awslabs.aws-documentation-mcp-server@latest"
-                ],
-                "env": {
-                    "FASTMCP_LOG_LEVEL": "ERROR"
-                }
+            "source": "custom",
+            "command": "mise",
+            "args": [
+                "exec",
+                "uv@latest",
+                "--",
+                "uvx",
+                "awslabs.aws-documentation-mcp-server@latest"
+            ],
+            "env": {
+                "FASTMCP_LOG_LEVEL": "ERROR"
             }
         }
     },
@@ -293,7 +303,6 @@
             "provider": "amazon-bedrock",
             "model": "anthropic.claude-3-7-sonnet-20250219-v1:0"
         },
-        "version": "2"
     }
     // -- </amzn_ai> --
 {% endif %}