diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml
index e5c11da1..c7b817b6 100644
--- a/.chezmoiexternal.toml
+++ b/.chezmoiexternal.toml
@@ -1,3 +1,7 @@
+[".local/share/alacritty/alacritty-theme"]
+type = "git-repo"
+url = "https://github.com/alacritty/alacritty-theme"
+
 [".local/share/nushell/default_env.nu"]
 type = "file"
 url = "https://raw.githubusercontent.com/nushell/nushell/0.86.0/crates/nu-utils/src/sample_config/default_env.nu"
diff --git a/.chezmoiignore b/.chezmoiignore
index 7efa37d1..ffd07b39 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -1,7 +1,7 @@
 .git
 .tea
+.pkgx
 .local
-.chezmoi
 .hyperfine.js
 bin
 docker-compose.yaml
@@ -12,6 +12,7 @@ entrypoint.sh
 README.md
 
 # Cache
+.cache
 .dccache
 .cs_cache
 .pnpm-state
@@ -31,7 +32,9 @@ README.md
 .config/zsh/.zcompdump*
 
 # SSH
-.ssh/known_hosts
+.ssh/id_rsa
+.ssh/id_rsa.pub
+.ssh/known_hosts*
 .ssh/environment-
 .ssh/codespaces.auto
 .ssh/codespaces.auto.pub
@@ -49,6 +52,7 @@ README.md
 .config/zsh/.zsh_sessions
 .zsh_sessions
 .config/nushell/history.txt
+.config/nushell/history.sqlite*
 
 # VIM
 .vim
@@ -100,7 +104,6 @@ Public
 Support
 
 # Extra files
-.config/chezmoi
 .config/coc
 .config/containers
 .config/docker
@@ -115,6 +118,7 @@ Support
 # Cache in config
 .config/todoist
 .config/tmux/plugins
+.config/chezmoi/chezmoistate.boltdb
 
 # Unmanaged
 .actrc
@@ -138,5 +142,6 @@ Support
 
 **/.DS_Store
 
+Code
 GitHub
 OrbStack
diff --git a/dot_config/alacritty/alacritty.yml b/dot_config/alacritty/alacritty.yml
index 68164705..682a45fa 100644
--- a/dot_config/alacritty/alacritty.yml
+++ b/dot_config/alacritty/alacritty.yml
@@ -1,3 +1,11 @@
 window:
   option_as_alt: Both
 
+import:
+  - ~/.local/share/alacritty/alacritty-theme/themes/catppuccin_latte.yaml
+
+font:
+  normal:
+    family: Hack
+
+live_config_reload: true
diff --git a/dot_config/chezmoi/chezmoi.toml b/dot_config/chezmoi/chezmoi.toml
new file mode 100644
index 00000000..464b0203
--- /dev/null
+++ b/dot_config/chezmoi/chezmoi.toml
@@ -0,0 +1,4 @@
+[git]
+    autoCommit = true
+    autoPush = true
+
diff --git a/dot_config/git/config b/dot_config/git/config
index 89dc8cb0..d34d2bf7 100644
--- a/dot_config/git/config
+++ b/dot_config/git/config
@@ -34,6 +34,10 @@
     clean = git-lfs clean -- %f
     smudge = git-lfs smudge -- %f
 
+[user]
+	name = Jason Morganson
+	email = 128727+jasonmorganson@users.noreply.github.com
+
 [credential "https://github.com"]
 	helper =
 	helper = !gh auth git-credential
diff --git a/dot_config/nushell/config.nu b/dot_config/nushell/config.nu
index b889aad7..efeeaaaa 100644
--- a/dot_config/nushell/config.nu
+++ b/dot_config/nushell/config.nu
@@ -7,7 +7,9 @@ $env.config = (
   | upsert history.isolation true
 )
 
+
 use xdg.nu
+use theme.nu
 use ls_colors.nu
 overlay use git.nu
 overlay use aliases.nu
diff --git a/dot_config/nushell/scripts/aliases.nu b/dot_config/nushell/scripts/aliases.nu
index 31064bbc..45ded1dd 100644
--- a/dot_config/nushell/scripts/aliases.nu
+++ b/dot_config/nushell/scripts/aliases.nu
@@ -40,6 +40,7 @@ export alias stash = git stash
 export alias wip = git commit -am "WIP"
 export alias fixup = git commit --fixup
 export alias unpushed = git log --branches --not --remotes --no-walk --decorate --oneline
+export def unclean [] { gfold -d json ~/Code | from json | where status != Clean }
 
 export alias vi = hx
 export alias vim = vi
diff --git a/dot_config/nushell/scripts/theme.nu b/dot_config/nushell/scripts/theme.nu
new file mode 100644
index 00000000..db8c5b8e
--- /dev/null
+++ b/dot_config/nushell/scripts/theme.nu
@@ -0,0 +1,9 @@
+module theme {
+  export def dark [] {
+    $env.config.color_config = $dark_theme
+  }
+
+  export def light [] {
+    $env.config.color_config = $light_theme
+  }
+}
diff --git a/dot_config/zellij/config.kdl b/dot_config/zellij/config.kdl
new file mode 100644
index 00000000..725b5355
--- /dev/null
+++ b/dot_config/zellij/config.kdl
@@ -0,0 +1,2 @@
+simplified_ui true
+
diff --git a/dot_config/zellij/empty_config.kdl b/dot_config/zellij/empty_config.kdl
deleted file mode 100644
index e69de29b..00000000
diff --git a/dot_profile b/dot_profile
index 9a7d189b..362f0b55 100644
--- a/dot_profile
+++ b/dot_profile
@@ -16,7 +16,7 @@ export XDG_TEMPLATES_DIR="$HOME/Templates"
 export XDG_VIDEOS_DIR="$HOME/Videos"
 
 # PATH
-export PATH="$HOME/.local/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin"
+export PATH="$HOME/.local/bin:/opt/homebrew/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
 
 # Homebrew
 export HOMEBREW_BUNDLE_FILE="~/Library/Mobile\ Documents/com~apple~CloudDocs/Homebrew/Brewfile"