diff --git a/.config/ghostty/config b/.config/ghostty/config
new file mode 100644
index 0000000..90da8e0
--- /dev/null
+++ b/.config/ghostty/config
@@ -0,0 +1,37 @@
+theme = "catppuccin-mocha"
+
+font-size = 14
+font-family = "MesloLGS Nerd Font Mono"
+font-thicken = true
+
+cursor-style = block
+cursor-style-blink = false
+
+background-opacity = 0.95
+background-blur-radius = 8
+
+mouse-hide-while-typing = true
+
+clipboard-read = allow
+clipboard-write = allow
+copy-on-select = clipboard
+clipboard-trim-trailing-spaces = true
+clipboard-paste-protection = true
+
+window-decoration = false
+
+window-padding-x = 2
+window-padding-y = 2
+window-padding-balance = true
+
+# Don't use if using fullscreen
+window-width = 168
+window-height = 45
+
+# macos stuff
+quit-after-last-window-closed = true
+macos-option-as-alt = true
+fullscreen = true
+# macos-non-native-fullscreen = true # fullscreen, hide menubar and dock toooo
+
+keybind = cmd+backspace=text:\x15 
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index a2903be..21b9de7 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -18,7 +18,7 @@
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.nvim": { "branch": "main", "commit": "4228f166ee9db3e910eea1915e2d3683028add47" },
+  "mini.nvim": { "branch": "main", "commit": "2faada1cffce5609d78ac5e81eaf3754e0476758" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
   "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
   "nvim-dap": { "branch": "master", "commit": "a6070b4e9e9a8ff1bc513c3748eff27080b0f44a" },
@@ -27,10 +27,10 @@
   "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
   "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" },
-  "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" },
+  "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" },
-  "nvim-treesitter": { "branch": "master", "commit": "2405274937718d520a40e03df92030dca6b4f0fd" },
+  "nvim-treesitter": { "branch": "master", "commit": "7e0fcf0d456fc5818da1af35b1a3f5c784fce457" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
   "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
diff --git a/.config/nvim/plugin/options.lua b/.config/nvim/plugin/options.lua
index 8673043..22b23cb 100644
--- a/.config/nvim/plugin/options.lua
+++ b/.config/nvim/plugin/options.lua
@@ -1,9 +1,10 @@
 local opt = vim.opt
 
 -- Use 4 space tabs
-opt.tabstop = 4
-opt.softtabstop = 4
-opt.shiftwidth = 4
+-- TODO: Change this back when no company work
+opt.tabstop = 2
+opt.softtabstop = 2
+opt.shiftwidth = 2
 
 opt.number = true
 opt.relativenumber = true
diff --git a/.zshrc b/.zshrc
index 63ba43a..2465d4c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,15 +1,6 @@
 # ---- homebrew ----
 eval "$(/opt/homebrew/bin/brew shellenv)"
 
-### ---- Syntax Highlighting ----
-source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-
-# ---- zoxide ----
-eval "$(zoxide init --cmd cd zsh)"
-
-# ---- fzf ----
-source <(fzf --zsh)
-
 # ---- Git Aliases ----
 alias ga='git add'
 alias gaa='git add -A'
@@ -26,14 +17,17 @@ alias python='python3'
 # ---- Air GO hot reload ----
 alias air="~/go/bin/air"
 
-# ---- bun ----
-export BUN_INSTALL="$HOME/.bun"
-export PATH="$BUN_INSTALL/bin:$PATH"
-
-[ -s "/Users/lilj/.bun/_bun" ] && source "/Users/lilj/.bun/_bun"
-
-# ---- startship ----
+# ---- starship ----
 eval "$(starship init zsh)"
 
-# ---- Better man pages ----
-export MANPAGER="nvim +Man!"
+# ---- zoxide ----
+eval "$(zoxide init --cmd cd zsh)"
+
+# ---- fzf ----
+source <(fzf --zsh)
+
+# ---- Syntax Highlighting ----
+source /nix/store/5vkzp4m7aazakijfaq579mk5i40j57x0-zsh-syntax-highlighting-0.8.0/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+eval "$(direnv hook zsh)"
+export PATH="/opt/homebrew/opt/node@18/bin:$PATH"