diff --git a/modules/home/git.nix b/modules/home/git.nix
index c9ae53c..aa60766 100644
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -164,6 +164,7 @@ in
           # =====
 
           # Pretty graph log with GPG info
+          history = "log --graph --color --pretty=format:\"%C(yellow)%H%C(green)%d%C(reset)%n%x20%cd%n%x20%cn%C(blue)%x20(%ce)%x20%C(cyan)[gpg:%GK%x20%G?]%C(reset)%n%x20%s%n\"";
           graph = "log --graph --color --pretty=format:\"%C(yellow)%H%C(green)%d%C(reset)%n%x20%cd%n%x20%cn%C(blue)%x20(%ce)%x20%C(cyan)[gpg:%GK%x20%G?]%C(reset)%n%x20%s%n\"";
           # One-line log
           ll = "log --oneline";
@@ -176,9 +177,15 @@ in
           # Short branch status
           st = "status -sb";
           # Formatted local branches
-          br = "branch --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) %(color:green)(%(committerdate:relative)) [%(authorname)]' --sort=-committerdate";
+          local-branches = "branch --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) %(color:green)(%(committerdate:relative)) [%(authorname)]' --sort=-committerdate";
           # Formatted remote branches
-          brr = "branch --remote --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) %(color:green)(%(committerdate:relative)) [%(authorname)]' --sort=-committerdate";
+          remote-branches = "branch --remote --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) %(color:green)(%(committerdate:relative)) [%(authorname)]' --sort=-committerdate";
+          # Create and switch to new branch
+          new-branch = "!f() { git checkout -b \"$1\"; }; f";
+          # Switch branch (interactive with fzf)
+          switch-branch = "!f() { branch=$(git branch --format='%(refname:short)' | fzf --height 40%); [ -n \"$branch\" ] && git checkout \"$branch\"; }; f";
+          # Delete branch (with confirmation)
+          delete-branch = "!f() { git branch -d \"$1\" 2>/dev/null || git branch -D \"$1\"; }; f";
 
           # Commit aliases
           # =====
@@ -186,35 +193,71 @@ in
           # Commit with message
           cm = "commit -m";
           # Amend last commit without editing message
+          amend = "commit --amend --no-edit";
           append = "commit --amend --no-edit";
           # Stage all and amend to last commit
-          aa = "!git add . && git commit --amend --no-edit";
+          fix = "!git add . && git commit --amend --no-edit";
           # Stage all, amend, rebase, and force push with lease
-          aap = "!f() { git add . && git commit --amend --no-edit && git rebase origin/$(git rev-parse --abbrev-ref HEAD) && git push --force-with-lease; }; f";
+          sync = "!f() { git add . && git commit --amend --no-edit && git rebase origin/$(git rev-parse --abbrev-ref HEAD) && git push --force-with-lease; }; f";
+          fck = "!f() { git add . && git commit --amend --no-edit && git rebase origin/$(git rev-parse --abbrev-ref HEAD) && git push --force-with-lease; }; f";
+          # Stage all, commit with message, and push
+          save = "!f() { git add --all && git commit -m \"$*\" && git push; }; f";
 
           # Fixup workflow aliases
           # =====
         
           # Interactive fixup: pick commit with fzf, stage all, create fixup
-          fixup = "!f() { commit=$(git log --oneline --color=always | fzf --ansi --height 40% | awk '{print $1}'); [ -n \"$commit\" ] && git add . && git commit --fixup=\"$commit\"; }; f";
-          # Quick fixup for previous commit
-          fixup1 = "!git add . && git commit --fixup=HEAD~1";
-          # Quick fixup for 2 commits ago
-          fixup2 = "!git add . && git commit --fixup=HEAD~2";
-          # Quick fixup for 3 commits ago
-          fixup3 = "!git add . && git commit --fixup=HEAD~3";
-          # Rebase with autosquash (auto-detects upstream/main/master)
-          squash-fixups = "!f() { upstream=$(git rev-parse --abbrev-ref --symbolic-full-name @{upstream} 2>/dev/null); if [ -n \"$upstream\" ]; then git rebase -i --autosquash \"$upstream\"; elif git show-ref --verify --quiet refs/remotes/origin/main; then git rebase -i --autosquash origin/main; elif git show-ref --verify --quiet refs/remotes/origin/master; then git rebase -i --autosquash origin/master; else echo \"No upstream branch found. Usage: git squash-fixups <base-branch>\"; fi; }; f";
+          fix-commit = "!f() { commit=$(git log --oneline --color=always | fzf --ansi --height 40% | awk '{print $1}'); [ -n \"$commit\" ] && git add . && git commit --fixup=\"$commit\"; }; f";
+          apply-fixes = "!f() { upstream=$(git rev-parse --abbrev-ref --symbolic-full-name @{upstream} 2>/dev/null); if [ -n \"$upstream\" ]; then git rebase -i --autosquash \"$upstream\"; elif git show-ref --verify --quiet refs/remotes/origin/main; then git rebase -i --autosquash origin/main; elif git show-ref --verify --quiet refs/remotes/origin/master; then git rebase -i --autosquash origin/master; else echo \"No upstream branch found. Usage: git squash-fixups <base-branch>\"; fi; }; f";
           # Squash all commits unique to current branch (auto-detects default branch)
+          cleanup = "!f() { default=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo \"main\"); if ! git show-ref --verify --quiet \"refs/remotes/origin/$default\"; then default=\"master\"; fi; if git show-ref --verify --quiet \"refs/remotes/origin/$default\"; then base=$(git merge-base HEAD \"origin/$default\"); git rebase -i \"$base\"; else echo \"Could not find default branch (main/master). Usage: git squash-all <base-branch>\"; fi; }; f";
           squash-all = "!f() { default=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo \"main\"); if ! git show-ref --verify --quiet \"refs/remotes/origin/$default\"; then default=\"master\"; fi; if git show-ref --verify --quiet \"refs/remotes/origin/$default\"; then base=$(git merge-base HEAD \"origin/$default\"); git rebase -i \"$base\"; else echo \"Could not find default branch (main/master). Usage: git squash-all <base-branch>\"; fi; }; f";
 
+          # Staging aliases
+          # =====
+          
+          # Stage all files
+          stage-all = "add --all";
+          # Unstage all staged files
+          unstage = "reset HEAD --";
+          # Interactive staging with fzf
+          stage = "!f() { git status -s | fzf --multi --ansi --height 40% | awk '{print $2}' | xargs git add; }; f";
+
           # Undo and reset aliases
           # =====
           
           # Interactive undo: pick state from reflog, show diff, confirm before hard reset
           undo = "!f() { target=$(git reflog --color=always --date=relative --format=\"%C(yellow)%h%C(reset) %C(cyan)%gd%C(reset) %C(green)%gs%C(reset)\" | fzf --ansi --height 40% --header=\"Select a state to reset to\" | awk '{print $1}'); if [ -n \"$target\" ]; then echo \"\n=== Diff between HEAD and selected state ===\n\"; git diff --color=always HEAD \"$target\"; echo \"\n=== This will discard all changes above ===\n\"; read -p \"Reset to $target? (y/N): \" confirm; if [ \"$confirm\" = \"y\" ] || [ \"$confirm\" = \"Y\" ]; then git reset --hard \"$target\"; else echo \"Reset cancelled.\"; fi; fi; }; f";
-          # Unstage all staged files
-          unstage = "reset HEAD --";
+
+          # Remote operations aliases
+          # =====
+          
+          # Fetch from all remotes
+          fetch-all = "fetch --all";
+          # Pull latest changes
+          pull-latest = "!f() { default=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo \"main\"); if ! git show-ref --verify --quiet \"refs/remotes/origin/$default\"; then default=\"master\"; fi; git pull origin \"$default\"; }; f";
+          # Push and set upstream
+          push-new = "!f() { git push -u origin $(git rev-parse --abbrev-ref HEAD); }; f";
+          # Update from main/master (rebase)
+          update-from-main = "!f() { default=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo \"main\"); if ! git show-ref --verify --quiet \"refs/remotes/origin/$default\"; then default=\"master\"; fi; git fetch origin && git rebase \"origin/$default\"; }; f";
+
+          # Stash aliases
+          # =====
+          
+          # Save current changes to stash
+          stash-save = "stash push -m";
+          # Apply and remove stash (interactive with fzf)
+          stash-pop = "!f() { stash=$(git stash list --color=always | fzf --ansi --height 40% | awk -F: '{print $1}'); [ -n \"$stash\" ] && git stash pop \"$stash\"; }; f";
+          # List stashes
+          stash-list = "stash list";
+
+          # Workflow aliases
+          # =====
+          
+          # Create new feature branch from main/master
+          new-feature = "!f() { default=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo \"main\"); if ! git show-ref --verify --quiet \"refs/remotes/origin/$default\"; then default=\"master\"; fi; git fetch origin && git checkout -b \"$1\" \"origin/$default\"; }; f";
+          # Compare current branch with another branch
+          compare = "!f() { git diff \"$1\"..HEAD; }; f";
 
           # Other aliases
           # =====