diff --git a/.config/nvim/lua/plugins/formatter.lua b/.config/nvim/lua/plugins/formatter.lua
index 60938ff..c048141 100644
--- a/.config/nvim/lua/plugins/formatter.lua
+++ b/.config/nvim/lua/plugins/formatter.lua
@@ -25,18 +25,18 @@ return {
     },
     formatters_by_ft = {
       lua = { 'stylua' },
-      astro = { 'prettier' },
       go = { 'gofmt' },
       python = { 'ruff' },
       javascript = { 'biome', 'prettier', stop_after_first = true },
       typescript = { 'biome', 'prettier', stop_after_first = true },
-      html = { 'prettier' },
-      css = { 'prettier' },
-      yaml = { 'prettier' },
+      html = { 'biome', 'prettier', stop_after_first = true },
+      css = { 'biome', 'prettier', stop_after_first = true },
       rust = { 'rustfmt', lsp_format = 'fallback' },
       json = { 'biome', 'prettier', stop_after_first = true },
+      astro = { 'biome', 'prettier', stop_after_first = true },
       vue = { 'biome', 'prettier' },
       svelte = { 'biome', 'prettier', stop_after_first = true },
+      yaml = { 'prettier' },
       php = { 'pint', stop_after_first = true },
     },
     formatters = {
diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
index a74df0a..0e611bf 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -17,6 +17,27 @@ return {
           path = 1,
         },
       },
+      lualine_x = {
+        {
+          'lsp_status',
+          icon = '', -- f013
+          symbols = {
+            -- Standard unicode symbols to cycle through for LSP progress:
+            spinner = { '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏' },
+            -- Standard unicode symbol for when LSP is done:
+            done = '✓',
+            -- Delimiter inserted between LSP names:
+            separator = ' ',
+          },
+          -- List of LSP names to ignore (e.g., `null-ls`):
+          ignore_lsp = {},
+          -- Display the LSP name
+          show_name = true,
+        },
+        'encoding',
+        'fileformat',
+        'filetype',
+      },
     },
   },
 }
diff --git a/.zshrc b/.zshrc
index 2e707bc..7cefb93 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,7 +1,7 @@
 # Set the directory we want to store zinit and plugins
 ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
-
-# Source/Load zinit
+[ ! -d $ZINIT_HOME ] && mkdir -p "$(dirname $ZINIT_HOME)"
+[ ! -d $ZINIT_HOME/.git ] && git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
 source "${ZINIT_HOME}/zinit.zsh"
 
 # Add in zsh plugins