diff --git a/home/home-darwin-work.nix b/home/home-darwin-work.nix
index 2df450b..cd8c3b0 100644
--- a/home/home-darwin-work.nix
+++ b/home/home-darwin-work.nix
@@ -1,30 +1,6 @@
 { config, lib, pkgs, globalInputs, system, ... }:
 
 {
-  # Claude Code Package Override for Corporate Work Environment
-  #
-  # This overlay overrides the default claude-code package specifically for work environments
-  # where corporate network restrictions may prevent access to npm registry distributions.
-  #
-  # Context:
-  # - The default claude-code package (used in home environments) fetches from npm registry
-  # - Corporate firewalls and security policies often block npm registry access
-  # - Our custom claude-code package uses Google Cloud Storage distribution as a workaround
-  # - This maintains the same package name across environments while adapting to network constraints
-  #
-  # Environment-specific behavior:
-  # - Home environments: Use standard npm-distributed claude-code package
-  # - Work environments: Use custom binary-distributed claude-code package from GCS
-  #
-  # This approach ensures consistent tooling availability regardless of network environment
-  # while respecting corporate security policies.
-  nixpkgs.overlays = [
-    (final: prev: {
-      unstable = prev.unstable // {
-        claude-code = prev.custom.claude-code;
-      };
-    })
-  ];
   # Home Manager configuration for Darwin work laptop
   # Corporate-friendly setup with essential development tools
 
@@ -140,5 +116,6 @@
 
   imports = [
     ./roles
+    ./roles/base-darwin
   ];
 }
diff --git a/home/home-desktop.nix b/home/home-desktop.nix
index e4fdd10..51cc312 100644
--- a/home/home-desktop.nix
+++ b/home/home-desktop.nix
@@ -29,5 +29,6 @@
 
   imports = [
     ./roles
+    ./roles/base-linux
   ];
 }
diff --git a/home/home-laptop-compact.nix b/home/home-laptop-compact.nix
index 72353ae..460b3ba 100644
--- a/home/home-laptop-compact.nix
+++ b/home/home-laptop-compact.nix
@@ -38,5 +38,6 @@
 
   imports = [
     ./roles
+    ./roles/base-linux
   ];
 }
diff --git a/home/home-live-usb.nix b/home/home-live-usb.nix
index 77b388f..8c659ba 100644
--- a/home/home-live-usb.nix
+++ b/home/home-live-usb.nix
@@ -30,6 +30,7 @@
 
   imports = [
     ./roles
+    ./roles/base-linux
   ];
 
   # Live USB specific overrides can go here if needed
diff --git a/home/home-media-center.nix b/home/home-media-center.nix
index fe58c6e..a6af15e 100644
--- a/home/home-media-center.nix
+++ b/home/home-media-center.nix
@@ -30,6 +30,7 @@
 
   imports = [
     ./roles
+    ./roles/base-linux
   ];
 
   # Media center specific overrides can go here if needed
diff --git a/home/roles/base-darwin/default.nix b/home/roles/base-darwin/default.nix
new file mode 100644
index 0000000..1b89696
--- /dev/null
+++ b/home/roles/base-darwin/default.nix
@@ -0,0 +1,7 @@
+{
+  # Base imports for Darwin home configurations
+  # Includes Darwin-specific roles that only work on macOS
+  imports = [
+    ../aerospace
+  ];
+}
diff --git a/home/roles/base-linux/default.nix b/home/roles/base-linux/default.nix
new file mode 100644
index 0000000..5f687ad
--- /dev/null
+++ b/home/roles/base-linux/default.nix
@@ -0,0 +1,8 @@
+{
+  # Base imports for Linux home configurations
+  # Includes Linux-specific roles that require Linux-only home-manager modules
+  imports = [
+    ../plasma-manager
+    ../i3+sway
+  ];
+}
diff --git a/home/roles/default.nix b/home/roles/default.nix
index ef4c321..f50fc91 100644
--- a/home/roles/default.nix
+++ b/home/roles/default.nix
@@ -1,4 +1,7 @@
 {
+  # Shared roles that work across all platforms (Linux, Darwin, etc.)
+  # Platform-specific roles are imported via base-linux or base-darwin
+  # in each home configuration file
   imports = [
     ./base
     ./communication
@@ -12,9 +15,6 @@
     ./office
     ./sync
     ./tmux
-    ./plasma-manager
     ./emacs
-    ./aerospace
-    ./i3+sway
   ];
 }