diff --git a/flake.lock b/flake.lock
index 6b6f72a..bb94d05 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,22 +23,19 @@
     },
     "nix-darwin": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1755275010,
-        "narHash": "sha256-lEApCoWUEWh0Ifc3k1JdVjpMtFFXeL2gG1qvBnoRc2I=",
-        "owner": "LnL7",
+        "lastModified": 1763136804,
+        "narHash": "sha256-6p2ljK42s0S8zS0UU59EsEqupz0GVCaBYRylpUadeBM=",
+        "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "7220b01d679e93ede8d7b25d6f392855b81dd475",
+        "rev": "973db96394513fd90270ea5a1211a82a4a0ba47f",
         "type": "github"
       },
       "original": {
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "type": "github"
+        "id": "nix-darwin",
+        "type": "indirect"
       }
     },
     "nix-index-database": {
@@ -62,6 +59,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1763191728,
+        "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1755736199,
         "narHash": "sha256-EP24GtYxPHLcTZNQjyXllR/zJ8unzgt4Vt8I+h8mhWo=",
@@ -82,7 +95,7 @@
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
         "nix-index-database": "nix-index-database",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index df76634..08d2f7f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,11 +8,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nix-darwin = {
-      url = "github:LnL7/nix-darwin";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -27,15 +22,20 @@
         inherit modules;
       };
 
-      mkHomeConfig = username: system: modules: home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs { inherit system; };
+      mkHomeConfig = username: modules: home-manager.lib.homeManagerConfiguration {
+        pkgs = import nixpkgs {
+          system = "x86_64-linux";
+        };
+
         extraSpecialArgs = {
           inherit inputs;
           user = username;
         };
+
         inherit modules;
       };
     in {
+
       # Nixos Configurations
       nixosConfigurations = {
         randomctf = mkNixosConfig "randomctf" [ ./config/shared.nix ./config/omen.nix ];
@@ -44,46 +44,24 @@
         r330-logging = mkNixosConfig "r330-logging" [ ./config/logging.nix ];
         mindforge = mkNixosConfig "mindforge" [ ./config/ai.nix ];
       };
-      # Home-Manager Configurations
 
+      # Home-Manager Configurations
       homeConfigurations = {
-        random = mkHomeConfig "random" "x86_64-linux" [
+        random = mkHomeConfig "random" [
           ./home/headful-nixos.nix
           ./home/modules/development.nix
           ./home/modules/gui-apps.nix
           ./home/modules/hacking.nix
         ];
 
-        sampledb = mkHomeConfig "sampledb" "x86_64-linux" [
+        sampledb = mkHomeConfig "sampledb" [
           ./home/headless-nixos.nix
           ./home/modules/development.nix
         ];
 
-        media = mkHomeConfig "media" "x86_64-linux" [ ./home/headless-nixos.nix ];
-        logging = mkHomeConfig "logging" "x86_64-linux" [ ./home/headless-nixos.nix ];
-        mindforge = mkHomeConfig "mindforge" "x86_64-linux" [ ./home/headless-nixos.nix ];
-      };
-
-      # Darwin Configuration
-
-      darwinConfigurations."Jadens-MacBook-Air" = nix-darwin.lib.darwinSystem {
-        system = "aarch64-darwin";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ./config/darwin.nix
-          home-manager.darwinModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.jadenmaxwell = import ./home/darwin.nix;
-          }
-        ];
-      };
-
-      homeConfigurations.jadenmaxwell = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages."aarch64-darwin";
-        modules = [
-          ./home/darwin.nix
-        ];
+        media = mkHomeConfig "media" [ ./home/headless-nixos.nix ];
+        logging = mkHomeConfig "logging" [ ./home/headless-nixos.nix ];
+        mindforge = mkHomeConfig "mindforge" [ ./home/headless-nixos.nix ];
       };
     };
 }