diff --git a/home/modules/emacs/default.nix b/home/modules/emacs/default.nix
index bca3afb..4640b23 100644
--- a/home/modules/emacs/default.nix
+++ b/home/modules/emacs/default.nix
@@ -10,11 +10,17 @@ let
     sha256 = "sha256-vHwgENjip2+AFzs4oZfnKEAJKwf5Zid7fakImvxxQUw=";
   };
 
-  # Default emacs configuration with vterm support
-  defaultEmacsPackage = pkgs.emacs-macport.pkgs.withPackages (epkgs: [
+  # Shared emacs packages
+  emacsPackages = epkgs: [
     epkgs.vterm
     epkgs.treesit-grammars.with-all-grammars
-  ]);
+  ];
+
+  # Default emacs configuration with vterm support
+  defaultEmacsPackage = 
+    if pkgs.stdenv.isDarwin 
+    then pkgs.emacs-macport.pkgs.withPackages emacsPackages
+    else pkgs.emacs.pkgs.withPackages emacsPackages;
 in
 {
   config = {
diff --git a/home/roles/development/default.nix b/home/roles/development/default.nix
index 2b071bf..4b3856e 100644
--- a/home/roles/development/default.nix
+++ b/home/roles/development/default.nix
@@ -12,9 +12,9 @@ in
 
   config = mkIf cfg.enable {
     home.packages = [
-      claude-code
-      codex
-      goose-cli
+      pkgs.claude-code
+      pkgs.codex
+      pkgs.goose-cli
 
       # Custom packages
       customPkgs.tea-rbw