From c1ce56782774f50db86aba9cab777bcd1a56b953 Mon Sep 17 00:00:00 2001
From: Graham Hall <graham@ghall.dev>
Date: Thu, 11 Jul 2024 21:14:47 -0400
Subject: [PATCH] zed config changes

---
 zed_config/settings.json | 42 +++++++++++++++++++++++++++-------------
 zsh_config/alias.zsh     |  2 +-
 zsh_config/zshrc         |  7 ++++---
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/zed_config/settings.json b/zed_config/settings.json
index b388e81..05763d3 100644
--- a/zed_config/settings.json
+++ b/zed_config/settings.json
@@ -1,12 +1,7 @@
-// Zed settings
-//
-// For information on how to configure Zed, see the Zed
-// documentation: https://zed.dev/docs/configuring-zed
-//
-// To see all of Zed's default settings without changing your
-// custom settings, run the `open default settings` command
-// from the command palette or from `Zed` application menu.
 {
+  "outline_panel": {
+    "dock": "right"
+  },
   "telemetry": {
     "diagnostics": true,
     "metrics": false
@@ -28,15 +23,17 @@
   "theme": {
     "mode": "system",
     "light": "Ayu Light",
-    "dark": "Catppuccin Mocha"
+    "dark": "Ayu Mirage"
   },
   "scrollbar": {
-    "show": "never"
+    "show": "system"
   },
-  "ui_font_family": "Hasklig",
+  "scroll_beyond_last_line": "vertical_scroll_margin",
+  "vertical_scroll_margin": 20,
+  "ui_font_family": "Rec Mono Semicasual",
   "ui_font_features": {},
   "ui_font_size": 17,
-  "buffer_font_family": "Hasklig",
+  "buffer_font_family": "Rec Mono Semicasual",
   "buffer_font_size": 15,
   "terminal": {
     "font_family": "FiraCode Nerd Font Mono"
@@ -44,7 +41,8 @@
   "relative_line_numbers": true,
   "soft_wrap": "editor_width",
   "tabs": {
-    "close_position": "left"
+    "close_position": "left",
+    "git_status": true
   },
   "notification_panel": {
     "button": false
@@ -52,9 +50,27 @@
   "git": {
     "git_gutter": "tracked_files"
   },
+  "indent_guides": {
+    "enabled": true,
+    "coloring": "indent_aware"
+  },
+  "wrap_guides": [80],
   "languages": {
     "Go": {
       "tab_size": 2
+    },
+    "Astro": {
+      "tab_size": 2
+    },
+    "TypeScript": {
+      "code_actions_on_format": {
+        "source.organizeImports": true
+      }
+    },
+    "TSX": {
+      "code_actions_on_format": {
+        "source.organizeImports": true
+      }
     }
   },
   "project_panel": {
diff --git a/zsh_config/alias.zsh b/zsh_config/alias.zsh
index 4e33e14..dda2d0a 100644
--- a/zsh_config/alias.zsh
+++ b/zsh_config/alias.zsh
@@ -23,5 +23,5 @@ alias brewfile="brew bundle dump --file=~/dotfiles/Brewfile --force --"
 alias installbrewfile="brew bundle install --file=~/dotfiles/Brewfile"
 
 # dotfiles
-alias config="bbedit ~/dotfiles"
+alias config="zed ~/dotfiles"
 alias linkdfs="sh ~/dotfiles/symlink_dotfiles.zsh"
diff --git a/zsh_config/zshrc b/zsh_config/zshrc
index 2fb607b..70155d8 100644
--- a/zsh_config/zshrc
+++ b/zsh_config/zshrc
@@ -1,3 +1,7 @@
+if [ "$TERM_PROGRAM" != "Apple_Terminal" ]; then
+	eval "$(oh-my-posh init zsh --config ~/dotfiles/misc_config/ohmyposh.json)"
+fi
+
 source $(brew --prefix nvm)/nvm.sh
 
 # Load seperated config files
@@ -8,9 +12,6 @@ unset conf
 
 [[ "$TERM_PROGRAM" == "CodeEditApp_Terminal" ]] && . "/Applications/CodeEdit.app/Contents/Resources/codeedit_shell_integration.zsh"
 
-if [ "$TERM_PROGRAM" != "Apple_Terminal" ]; then
-	eval "$(oh-my-posh init zsh --config ~/dotfiles/misc_config/ohmyposh.json)"
-fi
 
 eval $(thefuck --alias)
 eval "$(zoxide init zsh)"