diff --git a/.gitignore b/.gitignore
index 4cf20401..8ce1c6bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ gotools
 /dotfiles/config/xmonad/dist-newstyle/
 /dotfiles/config/hypr/hyprscratch.conf
 /.worktrees/
+/result
 
 # Secrets and machine-local state (managed via agenix/pass instead of git)
 /dotfiles/config/asciinema/config
diff --git a/nix-darwin/flake.nix b/nix-darwin/flake.nix
index 1de8ddce..d78fc0e1 100644
--- a/nix-darwin/flake.nix
+++ b/nix-darwin/flake.nix
@@ -73,7 +73,7 @@
       config,
       ...
     }: let
-      essentialPkgs = (import ../nixos/essential.nix {inherit pkgs lib inputs;}).environment.systemPackages;
+      essentialPkgs = (import ../nix-shared/system/essential.nix {inherit pkgs lib inputs;}).environment.systemPackages;
     in {
       networking.hostName = "mac-demarco-mini";
       imports = [(import ./gitea-actions-runner.nix)];
@@ -180,7 +180,7 @@
       };
 
       nixpkgs.overlays = [
-        (import ../nixos/overlay.nix)
+        (import ../nix-shared/overlays)
         # Use codex and claude-code from dedicated flakes with cachix
         (final: prev: {
           codex = inputs.codex-cli-nix.packages.${prev.stdenv.hostPlatform.system}.default;
@@ -209,6 +209,7 @@
           "codex-app"
           "ghostty"
           "raycast"
+          "vlc"
         ];
         masApps = {
           Xcode = 497799835;
diff --git a/nix-darwin/flake.nix.save b/nix-darwin/flake.nix.save
index 8bee3aa9..e3c63e30 100644
--- a/nix-darwin/flake.nix.save
+++ b/nix-darwin/flake.nix.save
@@ -112,7 +112,7 @@
         };
       };
 
-      nixpkgs.overlays = [(import ../nixos/overlay.nix)];
+      nixpkgs.overlays = [(import ../nix-shared/overlays)];
       environment.systemPackages = with pkgs; [
         #python-with-my-packages
         emacs
diff --git a/nix-darwin/home/common.nix b/nix-darwin/home/common.nix
index 918c19c5..06df9eb5 100644
--- a/nix-darwin/home/common.nix
+++ b/nix-darwin/home/common.nix
@@ -92,7 +92,7 @@
 in {
   imports = [
     inputs.agenix.homeManagerModules.default
-    ../../home-manager/codex-generated-skills.nix
+    ../../nix-shared/home-manager/codex-generated-skills.nix
   ];
 
   programs.home-manager.enable = true;
diff --git a/home-manager/codex-generated-skills.nix b/nix-shared/home-manager/codex-generated-skills.nix
similarity index 100%
rename from home-manager/codex-generated-skills.nix
rename to nix-shared/home-manager/codex-generated-skills.nix
diff --git a/nixos/overlay.nix b/nix-shared/overlays/default.nix
similarity index 100%
rename from nixos/overlay.nix
rename to nix-shared/overlays/default.nix
diff --git a/nixos/essential.nix b/nix-shared/system/essential.nix
similarity index 100%
rename from nixos/essential.nix
rename to nix-shared/system/essential.nix
diff --git a/nixos/bootstrap.nix b/nixos/bootstrap.nix
index 50482504..e1766c85 100644
--- a/nixos/bootstrap.nix
+++ b/nixos/bootstrap.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   imports = [
-    ./essential.nix
+    ../nix-shared/system/essential.nix
   ];
   environment.systemPackages = with pkgs; [
     emacs-auto
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 14a9ed0c..429e9e64 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -10,7 +10,7 @@
     ./desktop.nix
     ./electron.nix
     ./environment.nix
-    ./essential.nix
+    ../nix-shared/system/essential.nix
     ./extra.nix
     ./games.nix
     ./git-sync.nix
diff --git a/nixos/dotfiles-links.nix b/nixos/dotfiles-links.nix
index 65ad1980..82b08b98 100644
--- a/nixos/dotfiles-links.nix
+++ b/nixos/dotfiles-links.nix
@@ -55,7 +55,7 @@ let
     };
 in
 {
-  imports = [ ../home-manager/codex-generated-skills.nix ];
+  imports = [ ../nix-shared/home-manager/codex-generated-skills.nix ];
 
   home.file =
     builtins.listToAttrs (map mkManaged managedRelFiles);
diff --git a/nixos/nix.nix b/nixos/nix.nix
index 7d35091f..a3d0abe7 100644
--- a/nixos/nix.nix
+++ b/nixos/nix.nix
@@ -90,7 +90,7 @@
         # (import ./nvidia-container-toolkit-overlay.nix)
         (import ./runc-overlay.nix)
         (import ./emacs-overlay.nix)
-        (import ./overlay.nix)
+        (import ../nix-shared/overlays)
         # Use codex and claude-code from dedicated flakes with cachix
         (final: prev: {
           codex = inputs.codex-cli-nix.packages.${prev.stdenv.hostPlatform.system}.default;