@@ -69,6 +69,21 @@
       # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
       forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
 
+      overlayedNixpkgs =
+        system:
+        import nixpkgs {
+          inherit system;
+          config = {
+            allowUnfree = true;
+          };
+          overlays = [
+            (self: super: {
+              unstable = import nixpkgs-unstable { inherit system; };
+              personal = import ./packages/overlay.nix self super;
+            })
+          ];
+        };
+
       nixosSystem =
         {
           system,
@@ -76,22 +91,10 @@ modules,
           ...
         }@args:
         nixpkgs.lib.nixosSystem (
-          let
-            pkgsUnstable = import nixpkgs-unstable { inherit system; };
-          in
           {
             inherit system;
-            modules = [
-              {
-                nixpkgs.overlays = overlays ++ [
-                  (self: super: {
-                    unstable = pkgsUnstable;
-                    personal = import ./packages/overlay.nix self super;
-                  })
-                ];
-              }
-            ]
-            ++ modules;
+            pkgs = overlayedNixpkgs system;
+            inherit modules;
             specialArgs = {
               inherit pkgsUnstable;
               inherit inputs;

@@ -14,8 +14,6 @@ daemonIOSchedClass = "best-effort";
     daemonIOSchedPriority = 6;
   };
 
-  nixpkgs.config.allowUnfree = true;
-
   services.angrr = {
     enable = true;
     settings = {

@@ -11,7 +11,6 @@ enable = true;
     };
   };
 
-  nixpkgs.config.allowUnfree = true;
   services.picom = {
     enable = lib.mkDefault true;
   };

@@ -17,8 +17,6 @@
     trash-cli
   ];
 
-  nixpkgs.config.allowUnfree = true;
-
   services.devmon.enable = true;
 
   systemd.user.services.trash-clean = {