From a6040d54cf504540769a0058520698c9bebb202d Mon Sep 17 00:00:00 2001
From: Andrew Haynes <dmm.dev@pm.me>
Date: Thu, 26 Mar 2026 12:23:37 -0400
Subject: [PATCH] Brewfile

---
 .Brewfile                        | 17 +++++++
 .config/ghostty/linux/config     |  3 --
 .config/nvim/nvim-pack-lock.json | 59 ++++++++++++++++++++++++
 .zshrc                           |  7 +--
 env_mac.sh                       | 79 --------------------------------
 5 files changed, 80 insertions(+), 85 deletions(-)
 create mode 100644 .Brewfile
 delete mode 100644 .config/ghostty/linux/config
 create mode 100644 .config/nvim/nvim-pack-lock.json
 delete mode 100755 env_mac.sh

diff --git a/.Brewfile b/.Brewfile
new file mode 100644
index 0000000..4f3d016
--- /dev/null
+++ b/.Brewfile
@@ -0,0 +1,17 @@
+cargo "mdbook"
+cargo "rustlings"
+
+cask "ghostty"
+# cask "tailscale"
+
+brew "ripgrep"
+brew "eza"
+brew "starship"
+brew "tmux"
+brew "bat"
+brew "cmake"
+brew "fd"
+brew "fzf"
+brew "git"
+brew "zoxide"
+brew "stow"
diff --git a/.config/ghostty/linux/config b/.config/ghostty/linux/config
deleted file mode 100644
index ca0440d..0000000
--- a/.config/ghostty/linux/config
+++ /dev/null
@@ -1,3 +0,0 @@
-font-size = 10
-window-decoration = none
-theme = "tokyonight-moon"
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
new file mode 100644
index 0000000..bbfb58d
--- /dev/null
+++ b/.config/nvim/nvim-pack-lock.json
@@ -0,0 +1,59 @@
+{
+  "plugins": {
+    "blink.cmp": {
+      "rev": "451168851e8e2466bc97ee3e026c3dcb9141ce07",
+      "src": "https://github.com/saghen/blink.cmp",
+      "version": ">=0.0.0"
+    },
+    "colorizer": {
+      "rev": "a065833f35a3a7cc3ef137ac88b5381da2ba302e",
+      "src": "https://github.com/norcalli/nvim-colorizer.lua"
+    },
+    "conform.nvim": {
+      "rev": "086a40dc7ed8242c03be9f47fbcee68699cc2395",
+      "src": "https://github.com/stevearc/conform.nvim"
+    },
+    "fzf-lua": {
+      "rev": "8a79ee54d6216d10b2f153921a12b152be0c1a20",
+      "src": "https://github.com/ibhagwan/fzf-lua"
+    },
+    "mason.nvim": {
+      "rev": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65",
+      "src": "https://github.com/mason-org/mason.nvim"
+    },
+    "mini.pairs": {
+      "rev": "d5a29b6254dad07757832db505ea5aeab9aad43a",
+      "src": "https://github.com/nvim-mini/mini.pairs",
+      "version": ">=0.0.0"
+    },
+    "nvim-colorizer.lua": {
+      "rev": "a065833f35a3a7cc3ef137ac88b5381da2ba302e",
+      "src": "https://github.com/norcalli/nvim-colorizer.lua"
+    },
+    "nvim-tmux-navigation": {
+      "rev": "4898c98702954439233fdaf764c39636681e2861",
+      "src": "https://github.com/alexghergh/nvim-tmux-navigation"
+    },
+    "nvim-treesitter": {
+      "rev": "2b50ab5ccbcd9e5708deb351308edd738adbf84c",
+      "src": "https://github.com/nvim-treesitter/nvim-treesitter"
+    },
+    "nvim-web-devicons": {
+      "rev": "d7462543c9e366c0d196c7f67a945eaaf5d99414",
+      "src": "https://github.com/nvim-tree/nvim-web-devicons"
+    },
+    "polydev": {
+      "rev": "62015919ddfe04c94aecc1977e6a44c08142ded3",
+      "src": "git@moo:dmm/polydev.git",
+      "version": "'main'"
+    },
+    "rose-pine": {
+      "rev": "cf2a288696b03d0934da713d66c6d71557b5c997",
+      "src": "https://github.com/rose-pine/neovim"
+    },
+    "undotree": {
+      "rev": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d",
+      "src": "https://github.com/mbbill/undotree"
+    }
+  }
+}
diff --git a/.zshrc b/.zshrc
index 505da92..bcfd48c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -32,8 +32,9 @@ export PATH="$HOME/.local/bin:$PATH"
 alias cat="bat"
 alias rebuild="sudo darwin-rebuild switch --flake /etc/nix-darwin/#Andrews-MacBook-Air";
 alias enix="nvim /etc/nix-darwin/flake.nix"
-alias v="nvim";
-alias ls="eza -la";
+alias v="nvim"
+alias ls="eza -a"
+alias mosh="mosh --ssh=/usr/bin/ssh"
 
 
 
@@ -44,7 +45,7 @@ if [[ $(uname) != "Darwin" ]]; then
 	alias env="sh /home/andrew/personal/dotfiles/env_linux.sh"
 else
 	alias env='sh ~/personal/dotfiles/env_mac.sh'
-	export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+        export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -l man'"
 	export GOOGLE_CLOUD_PROJECT="development-477121"
 	export HOMEBREW_NO_AUTO_UPDATE=1
 	export HOMEBREW_NO_ENV_HINTS=1
diff --git a/env_mac.sh b/env_mac.sh
deleted file mode 100755
index 050b4e5..0000000
--- a/env_mac.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-CONFIG_DIR=~/personal/dotfiles/.config
-LOCAL_DIR=~/personal/dotfiles/.local/bin
-DEST_DIR="${XDG_CONFIG_HOME:-$HOME/.config}"
-
-for dir in "$CONFIG_DIR"/*/; do
-  [ -d "$dir" ] || continue
-
-  name=$(basename "$dir")
-  target="$DEST_DIR/$name"
-
-  rm -rf "$target"
-  echo "Removing: $target"
-done
-
-echo
-
-for dir in "$CONFIG_DIR"/*/; do
-  [ -d "$dir" ] || continue
-
-  name=$(basename "$dir")
-  target="$DEST_DIR/$name"
-
-  cp -r "$dir" "$target"
-  echo "Copying: $dir → $target"
-done
-
-echo
-echo "Copying executables from $LOCAL_DIR to ~/.local/bin"
-
-mkdir -p "$HOME/.local/bin"
-for file in "$LOCAL_DIR"/*; do
-  [ -f "$file" ] || continue
-
-  name=$(basename "$file")
-  target="$HOME/.local/bin/$name"
-
-  rm -f "$target"
-  cp "$file" "$target"
-  chmod +x "$target"
-  echo "Copied: $file → $target"
-done
-
-echo
-echo "Copying .zshrc to $HOME"
-
-target="$HOME/.zshrc"
-rm -f "$target"
-cp "$HOME/personal/dotfiles/.zshrc" "$target"
-echo "Copied: .zshrc → $target"
-
-echo
-echo "Copying tmux config"
-
-target="$HOME/.config/tmux/tmux.conf"
-mkdir -p "$(dirname "$target")"
-rm -f "$target"
-cp "$HOME/personal/dotfiles/.config/tmux/tmux.conf" "$target"
-echo "Copied: tmux.conf → $target"
-
-echo
-
-echo "Copying starship config"
-target="$HOME/.config/starship.toml"
-mkdir -p "$(dirname "$target")"
-rm -f "$target"
-cp "$HOME/personal/dotfiles/.config/starship.toml" "$target"
-echo "Copied: starship.toml → $target"
-rm -rf ~/.config/ghostty/linux
-
-echo "Copying .ssh to $HOME"
-
-target="$HOME/.ssh/config"
-rm -rf "$target"
-cp "$HOME/personal/dotfiles/.ssh/config" "$target"
-echo "Copied: .ssh → $target"
-
-echo