diff --git a/aliases.org b/aliases.org
new file mode 100644
index 0000000..4038aa1
--- /dev/null
+++ b/aliases.org
@@ -0,0 +1,24 @@
+#+PROPERTY: header-args :mkdirp yes
+#+title: Fish Aliases
+
+* System-Specific Aliases
+Generate aliases based on system type.
+
+#+name: system-check
+#+begin_src emacs-lisp :results raw
+(if (eq system-type 'darwin)
+    "set -g IS_MAC 1"
+    "set -g IS_MAC 0")
+#+end_src
+
+#+begin_src fish :tangle ~/.config/fish/aliases.fish :noweb yes
+# Generated from aliases.org - do not edit directly
+<<system-check>>
+
+# System-specific aliases
+if test $IS_MAC -eq 0
+    function zed-start
+        steam-run /usr/local/bin/zed.app/Contents/MacOS/Zed
+    end
+end
+#+end_src
diff --git a/dotfiles.org b/dotfiles.org
index 4b0a154..0342f34 100644
--- a/dotfiles.org
+++ b/dotfiles.org
@@ -60,6 +60,9 @@ fish_vi_key_bindings
 
 # Initialize starship prompt
 starship init fish | source
+
+# Load aliases if they exist
+test -f ~/.config/fish/aliases.fish && source ~/.config/fish/aliases.fish
 #+end_src
 
 *** Mode Prompt