diff --git a/.config/aider/aider.yaml b/.config/aider/aider.yaml
new file mode 100644
index 0000000..b78a6b4
--- /dev/null
+++ b/.config/aider/aider.yaml
@@ -0,0 +1,8 @@
+openai-api-base: https://api.githubcopilot.com
+model: o4-mini
+weak-model: gpt-4.1
+editor-model: gpt-4.1
+show-model-warnings: false
+max-chat-history-tokens: 8000
+disable-playwright: true
+watch-files: true
diff --git a/.config/git/ignore b/.config/git/ignore
new file mode 100644
index 0000000..204e46e
--- /dev/null
+++ b/.config/git/ignore
@@ -0,0 +1,4 @@
+aider.yaml
+.aider*
+--Main model*
+--Weak model*
diff --git a/.config/nvim b/.config/nvim
index df042cf..ed1f52a 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit df042cfac24fd55debac6a35f0444f7be2c645a7
+Subproject commit ed1f52af1109cc11c31a99dfc80e13c37c99a9aa
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index 12a89a0..66b5b7e 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -22,7 +22,9 @@ alias \
     yt="youtube-dl --add-metadata -i" \
     yta="yt -x -f bestaudio/best" \
     ffmpeg="ffmpeg -hide_banner" \
-    tmux="tmux -f ~/.config/tmux/tmux.conf"
+    tmux="tmux -f ~/.config/tmux/tmux.conf" \
+    aider="aider --config ~/.config/aider/aider.yaml"
+
 
 # Colorize commands when possible.
 alias \
@@ -83,7 +85,9 @@ alias \
     dgit="git --git-dir ~/.config/dotfiles/.git --work-tree=$HOME" \
     .z="source ~/.config/shell/profile" \
     .a="source ~/.config/shell/aliasrc" \
-    testmic="arecord -vv -f dat /dev/null"
+    testmic="arecord -vv -f dat /dev/null" \
+    notes="cd ~/Tower/Notes && nvim ." \
+    aid="aider"
 
 # Dev
 alias \
@@ -112,7 +116,7 @@ function dut() {
 
 function gh() {
     local -a commands=(
-      "Recover deleted file:                   git checkout HEAD~1 -- <file>"
+      "Recover deleted file:                   git checkout HEAD -- <file>"
       "Revert previous commit keeping changes: git revert --no-commit HEAD~1"
       "Undo merge/pull that caused conflicts:  git revert -m 1 HEAD~1"
       "Abort rebase:                           git rebase --abort"
diff --git a/.config/shell/profile b/.config/shell/profile
index c4f6a38..90e3023 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -46,6 +46,13 @@ export ELECTRUMDIR="${XDG_DATA_HOME:-$HOME/.local/share}/electrum"
 export ANDROID_AVD_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/android/avd"
 export ANDROID_USER_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/android"
 
+# Export OPENAI_API_KEY from GitHub Copilot config
+if [ -f "$HOME/.config/github-copilot/apps.json" ]; then
+  export OPENAI_API_KEY="$(
+    jq -r 'to_entries[1].value.oauth_token' "$HOME/.config/github-copilot/apps.json" 2>/dev/null
+  )"
+fi
+
 # Other program settings
 export DICS="/usr/share/stardicts/dic/"
 export SUDO_ASKPASS="$HOME/.local/bin/dmenupass"
@@ -64,10 +71,11 @@ export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads.
 export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm
 
 # Development variables
-export ANDROID_SDK_ROOT="/opt/android-sdk"
+export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
 export ANDROID_HOME="$ANDROID_SDK_ROOT"
 
 export PATH="$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$ANDROID_HOME/emulator:$XDG_DATA_HOME/cargo/bin"
+export PATH="$HOME/development/flutter/bin:$PATH"
 
 # Get pretty colours for ls
 #. /usr/share/LS_COLORS/dircolors.sh
@@ -162,3 +170,5 @@ ex=🎯:\
 export NVM_DIR="$HOME/.config/nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+. "$HOME/.local/share/../bin/env"
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 3794757..4a04fb2 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -184,3 +184,5 @@ set -o ignoreeof # Stop CTRL-D from quitting
 source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null
 
 [[ -s /etc/profile.d/autojump.sh ]] && source /etc/profile.d/autojump.sh
+
+. "$HOME/.local/share/../bin/env"
diff --git a/.gitconfig b/.gitconfig
index b709362..c4d6528 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,3 +5,5 @@
 	rebase = true
 [init]
 	defaultBranch = main
+[core]
+	excludesfile = /home/chris/.config/git/ignore