From fb78d88272149a153b1637a06a9ca24d4977a6a2 Mon Sep 17 00:00:00 2001
From: Jeremie Fraeys <jfaeys@gmail.com>
Date: Wed, 18 Dec 2024 20:50:25 -0500
Subject: [PATCH] keymapping and prompt formatting changes

---
 aerospace/.config/aerospace/aerospace.toml | 18 +++++++++++++-----
 starship/.config/starship.toml             |  9 +++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/aerospace/.config/aerospace/aerospace.toml b/aerospace/.config/aerospace/aerospace.toml
index 34201f5..9d9235f 100644
--- a/aerospace/.config/aerospace/aerospace.toml
+++ b/aerospace/.config/aerospace/aerospace.toml
@@ -44,6 +44,9 @@ on-focused-monitor-changed = ['move-mouse monitor-lazy-center']
 # Also see: https://nikitabobko.github.io/AeroSpace/goodness#disable-hide-app
 automatically-unhide-macos-hidden-apps = false
 
+# Disable window opening animation
+# disable-window-opening-animation = true
+
 # Possible values: (qwerty|dvorak)
 # See https://nikitabobko.github.io/AeroSpace/guide#key-mapping
 [key-mapping]
@@ -123,9 +126,9 @@ alt-shift-l = 'move right'
 alt-1 = 'workspace 1'
 alt-2 = 'workspace 2'
 alt-3 = 'workspace 3'
-alt-b = 'workspace B'
 alt-c = 'workspace C'
 alt-e = 'workspace E'
+alt-g = 'workspace G'
 alt-n = 'workspace N'
 alt-m = 'workspace M'
 alt-s = 'workspace S'
@@ -185,14 +188,14 @@ X = ['secondary', 'dell']
 Y = ['secondary', 'dell']
 Z = ['secondary', 'dell']
 
-[[on-window-detected]]
-if.app-id = 'org.mozilla.firefox'
-run = "move-node-to-workspace B"
-
 [[on-window-detected]]
 if.app-id = 'com.apple.iCal'
 run = "move-node-to-workspace C"
 
+[[on-window-detected]]
+if.app-id = 'org.mozilla.firefox'
+run = "move-node-to-workspace G"
+
 [[on-window-detected]]
 if.app-id = 'com.github.wez.wezterm'
 run = "move-node-to-workspace T"
@@ -216,3 +219,8 @@ run = "move-node-to-workspace V"
 [[on-window-detected]]
 if.app-id = 'com.apple.finder'
 run = "move-node-to-workspace E"
+
+# after-startup-command = [
+#     'exec-and-forget borders active_color=0xffe1e3e4 inactive_color=0xff494d64 width=5.0'
+# ]
+
diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml
index 91e4354..50bf6cf 100644
--- a/starship/.config/starship.toml
+++ b/starship/.config/starship.toml
@@ -3,14 +3,12 @@
 
 add_newline = false
 palette = "solarized_light"
+# palette = "monokai_pro"
 command_timeout = 5000
 
 # Customize your prompt to ensure everything is on a single line
 format = """\
     $directory\
-    $git_branch\
-    $git_status\
-    $git_metrics\
     $docker_context\
     $conda\
     $golang\
@@ -25,6 +23,9 @@ format = """\
     """
 
 right_format = """\
+    $git_branch\
+    $git_status\
+    $git_metrics\
     $cmd_duration\
 """
 
@@ -66,7 +67,7 @@ format = '[ $symbol$count]($style)'
 number_threshold = 4
 
 [cmd_duration]
-format = "[$duration]($style)"
+format = "[ $duration]($style)"
 style = "yellow"
 
 # Container