From c612a8dc8f671d4fd0053e4d20db8172fa944f31 Mon Sep 17 00:00:00 2001
From: Graham Hall <graham@ghall.dev>
Date: Sun, 28 Apr 2024 15:37:38 -0400
Subject: [PATCH] update and clean up some configs

---
 Brewfile                   |  1 -
 micro_config/bindings.json |  4 +++-
 micro_config/settings.json |  2 +-
 zed_config/keymap.json     | 20 +++++++++++++++++++-
 zed_config/settings.json   |  3 ++-
 zsh_config/alias.zsh       | 27 +++++++++++++++++++++------
 6 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/Brewfile b/Brewfile
index 2ab4b1e..8a891d2 100644
--- a/Brewfile
+++ b/Brewfile
@@ -65,7 +65,6 @@ cask "iterm2"
 cask "keyboardcleantool"
 cask "keystash"
 cask "latest"
-cask "lingon-x"
 cask "llamachat"
 cask "mongodb-compass"
 cask "nova"
diff --git a/micro_config/bindings.json b/micro_config/bindings.json
index a4f3fa4..cee1a91 100644
--- a/micro_config/bindings.json
+++ b/micro_config/bindings.json
@@ -4,6 +4,8 @@
     "Alt-f": "command:format",
     "Alt-k": "command:hover",
     "Alt-r": "command:references",
+    "CtrlP": "command:palettero",
     "CtrlSpace": "command:lspcompletion",
-    "CtrlUnderscore": "lua:comment.comment"
+    "CtrlUnderscore": "lua:comment.comment",
+    "F6": "command-edit:gorename "
 }
diff --git a/micro_config/settings.json b/micro_config/settings.json
index b9d75f6..8a8ffe2 100644
--- a/micro_config/settings.json
+++ b/micro_config/settings.json
@@ -1,5 +1,5 @@
 {
-    "colorscheme": "catppuccin-frappe",
+    "colorscheme": "bubblegum",
     "softwrap": true,
     "tabsize": 2
 }
diff --git a/zed_config/keymap.json b/zed_config/keymap.json
index 8b111ec..31f1a0e 100644
--- a/zed_config/keymap.json
+++ b/zed_config/keymap.json
@@ -2,7 +2,8 @@
   {
     "context": "Workspace",
     "bindings": {
-      "cmd-shift-o": "file_finder::Toggle"
+      "cmd-shift-o": "file_finder::Toggle",
+      "cmd-b": "workspace::ToggleRightDock"
     }
   },
   {
@@ -12,5 +13,22 @@
       "cmd-p": "outline::Toggle",
       "cmd-r": "task::Spawn"
     }
+  },
+  {
+    "context": "Pane",
+    "bindings": {
+      "cmd-1": ["pane::ActivateItem", 0],
+      "cmd-2": ["pane::ActivateItem", 1],
+      "cmd-3": ["pane::ActivateItem", 2],
+      "cmd-4": ["pane::ActivateItem", 3],
+      "cmd-5": ["pane::ActivateItem", 4],
+      "cmd-6": ["pane::ActivateItem", 5],
+      "cmd-7": ["pane::ActivateItem", 6],
+      "cmd-8": ["pane::ActivateItem", 7],
+      "cmd-9": ["pane::ActivateItem", 8],
+      "cmd-0": "pane::ActivateLastItem",
+      "alt-cmd-left": ["workspace::ActivatePaneInDirection", "Left"],
+      "alt-cmd-right": ["workspace::ActivatePaneInDirection", "Right"]
+    }
   }
 ]
diff --git a/zed_config/settings.json b/zed_config/settings.json
index 96d0dce..523fa37 100644
--- a/zed_config/settings.json
+++ b/zed_config/settings.json
@@ -53,7 +53,8 @@
     }
   },
   "project_panel": {
-    "indent_size": 10
+    "indent_size": 10,
+    "dock": "right"
   },
   "file_types": {
     "HTML": ["hbs", "njk"]
diff --git a/zsh_config/alias.zsh b/zsh_config/alias.zsh
index 491cb0f..4e33e14 100644
--- a/zsh_config/alias.zsh
+++ b/zsh_config/alias.zsh
@@ -1,12 +1,27 @@
-alias config="bbedit ~/dotfiles"
+# overrides
+alias ls="eza"
+alias cd="z"
+
+# developer stuff
 alias nv="open -a Nova"
+alias runx="npx concurrently \"serverless offline\" \"nx dev frontend\""
+
+# git
 alias ptob="gh pr create -B beta"
 alias prune-git="git remote prune origin"
+
+# ssh
+alias macmini="ssh admin@Memory-Alpha.local"
+
+# shell scripts
 alias dev="sh ~/dotfiles/scripts/run-dev.sh"
 alias lint="sh ~/dotfiles/scripts/run-lint.sh"
 alias commit="sh ~/dotfiles/scripts/git-commit-push.sh"
-alias macmini="ssh admin@Memory-Alpha.local"
-alias ls="eza"
-alias cd="z"
-alias runx="npx concurrently \"serverless offline\" \"nx dev frontend\""
-alias brewfile="brew bundle dump --file=~/dotfiles/Brewfile --force"
+
+# homebrew
+alias brewfile="brew bundle dump --file=~/dotfiles/Brewfile --force --"
+alias installbrewfile="brew bundle install --file=~/dotfiles/Brewfile"
+
+# dotfiles
+alias config="bbedit ~/dotfiles"
+alias linkdfs="sh ~/dotfiles/symlink_dotfiles.zsh"