diff --git a/env/.config/nvim/init.lua b/env/.config/nvim/init.lua
index 0a258a1..da301d1 100644
--- a/env/.config/nvim/init.lua
+++ b/env/.config/nvim/init.lua
@@ -121,7 +121,6 @@ vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
 	callback = function(args)
 		local first_line = vim.api.nvim_buf_get_lines(args.buf, 0, 1, false)[1] or ""
 		if first_line:match("^#!.*zsh") then
-			-- vim.bo[args.buf].filetype = "bash"
 			vim.cmd.setlocal("filetype=bash")
 		end
 	end,
@@ -145,8 +144,6 @@ vim.api.nvim_create_autocmd("BufEnter", {
 	pattern = "neomutt*",
 	group = vim.api.nvim_create_augroup('my.neomutt', defaultopts),
 	callback = function(_)
-		-- HACK: Set filetype to markdown for '.md' files.
-		-- Not sure why it doesn't detect these as markdown files, but this fixes the issue.
 		vim.cmd.setlocal("filetype=markdown")
 		vim.cmd.setlocal("textwidth=120")
 		vim.cmd.setlocal("spell spelllang=en_us")
diff --git a/runs/dev b/runs/dev
index 0d92e5b..9993bf6 100755
--- a/runs/dev
+++ b/runs/dev
@@ -1,36 +1,36 @@
 #!/usr/bin/env bash
 
 if ! command -v yay >/dev/null 2>&1; then
-  sudo pacman -S --noconfirm --needed git base-devel
-  git clone https://aur.archlinux.org/yay.git ~/yay
-  cd ~/yay
-  makepkg -si
-  rm -rf ~/yay
+	sudo pacman -S --noconfirm --needed git base-devel
+	git clone https://aur.archlinux.org/yay.git ~/yay
+	cd ~/yay
+	makepkg -si
+	rm -rf ~/yay
 fi
 
 # Packages
 yay -S --noconfirm --needed \
-  bat \
+	bat \
 	bob \
-  eza \
-  fastfetch \
-  fzf \
-  git-lfs \
-  gum \
-  jq \
-  neovim \
-  nodejs \
-  npm \
-  pcre2 \
-  starship \
-  tldr \
-  tmux \
-  tree-sitter-cli \
-  zoxide \
-  zsh
+	eza \
+	fastfetch \
+	fzf \
+	git-lfs \
+	gum \
+	jq \
+	neovim \
+	nodejs \
+	npm \
+	pcre2 \
+	ripgrep \
+	starship \
+	tldr \
+	tmux \
+	tree-sitter-cli \
+	zoxide
 
 # Fonts
 yay -S --noconfirm \
-  ttf-jetbrains-mono-nerd \
-  ttf-firacode \
-  ttf-inconsolata-nerd
+	ttf-jetbrains-mono-nerd \
+	ttf-firacode \
+	ttf-inconsolata-nerd
diff --git a/runs/system b/runs/system
index 3d5e1c5..a8db348 100755
--- a/runs/system
+++ b/runs/system
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 
 yay ${1:-"-S --noconfirm"} catppuccin-gtk-theme-mocha \
-  nwg-look \
-  wl-clipboard \
-  pam-u2f \
-  pcsc-tools \
-  swaync \
-  yubikey-manager \
-  nfs-utils \
-  firewalld
+	nwg-look \
+	wl-clipboard \
+	pam-u2f \
+	pcsc-tools \
+	swaync \
+	yubikey-manager \
+	nfs-utils \
+	firewalld \
+	zsh
diff --git a/system b/system
index 103411a..7ee85f8 100755
--- a/system
+++ b/system
@@ -4,31 +4,32 @@
 
 dry_run="0"
 while [[ $# -gt 0 ]]; do
-  echo "ARG: \"$1\""
+	echo "ARG: \"$1\""
 
-  # Handle a --dry or --dry-run argument
-  if [[ "$1" =~ ^--dry ]]; then
-    dry_run="1"
-  fi
-  shift
+	# Handle a --dry or --dry-run argument
+	if [[ "$1" =~ ^--dry ]]; then
+		dry_run="1"
+	fi
+	shift
 done
 
 log() {
-  if [[ $dry_run == "1" ]]; then
-    echo "[DRY_RUN]: $1"
-  else
-    echo "$1"
-  fi
+	if [[ $dry_run == "1" ]]; then
+		echo "[DRY_RUN]: $1"
+	else
+		echo "$1"
+	fi
 }
 
 log_and_run() {
-  log "Running: \"$*\""
+	log "Running: \"$*\""
 
-  if [[ $dry_run == "0" ]]; then
-    eval "$1"
-  fi
+	if [[ $dry_run == "0" ]]; then
+		eval "$1"
+	fi
 }
 
+log_and_run "sudo chsh --shell $(which zsh)"
 log_and_run "systemctl --user daemon-reload"
 log_and_run "systemctl --user enable --now hyprpaper.service"
 log_and_run "systemctl --user enable --now hypridle.service"