diff --git a/.config/yadm/bootstrap.d/30-Yazi.sh b/.config/yadm/bootstrap.d/30-Yazi.sh
index 83f13eb..3a5340b 100755
--- a/.config/yadm/bootstrap.d/30-Yazi.sh
+++ b/.config/yadm/bootstrap.d/30-Yazi.sh
@@ -1,3 +1,5 @@
 #!/bin/env sh
 
-yay -S --needed yazi p7zip jq poppler fd ripgrep fzf zoxide imagemagick
+yay -S --needed yazi p7zip jq poppler fd ripgrep fzf zoxide imagemagick fuse-archive zip
+
+ya pack --install
diff --git a/.config/yadm/config b/.config/yadm/config
new file mode 100644
index 0000000..a7587d2
--- /dev/null
+++ b/.config/yadm/config
@@ -0,0 +1,2 @@
+[yadm]
+	auto-alt = false
diff --git a/.config/yadm/hooks/pre_commit b/.config/yadm/hooks/pre_commit
new file mode 100755
index 0000000..26a9a28
--- /dev/null
+++ b/.config/yadm/hooks/pre_commit
@@ -0,0 +1,28 @@
+#!/bin/env sh
+
+foundSymlinks=false
+
+for file in $(yadm diff --name-only --cached); do
+  lsResult=$(ls -1 -l "$file")
+  if [[ $lsResult != *"->"* ]]; then
+    break
+  fi
+
+  symlinkTarget=$(echo "$lsResult" | awk '{print $NF}')
+
+  if [[ $lsResult != *"##"* ]]; then
+    break
+  fi
+
+  echo "$file is a YADM symlink. Telling git to ignore it..."
+
+  yadm restore --staged "$file"
+  echo "$file" >>~/.gitignore
+
+  foundSymlinks=true
+done
+
+if [ $foundSymlinks ]; then
+  echo "Symlinks found. Adding .gitignore to commit..."
+  yadm add ~/.gitignore
+fi
diff --git a/.gitignore b/.gitignore
index bd6d3a0..273cc83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,23 @@
-# Symlinks
-~\.config\hypr\config\Monitors.conf
-.config\hypr\config\WorkspaceRules.conf
-.config\hypr\config\settings\Input.conf
+/*
+!/.gitignore
 
-*.key
+!/.config/
+/.config/*
+
+# yazi
+!/.config/yazi/
+/.config/yazi/plugins/*
+
+!/.config/hypr/
+!/.config/ghostty/
+!/.config/nvim/
+!/.config/yadm/
+!/.config/waybar/
+!/.config/evremap/
+
+# DO NOT EDIT ANYTHING PAST HERE!
+# Scripts automatically add entries here
+.config/hypr/config/Monitors.conf
+.config/hypr/config/WorkspaceRules.conf
+.config/hypr/config/settings/Input.conf
+.config/waybar/Output.config.json