factor out common configuration options

1 files changed, 21 insertions, 30 deletions

diff --git a/flake.nix b/flake.nix
index ac3ee30..165e627 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,40 +2,31 @@
   inputs = {
     personal-webpage = {
       url = "github:qaristote/webpage";
-      inputs = {
-        nixpkgs.follows = "/nixpkgs";
-        flake-utils.follows = "/flake-utils";
-      };
+      inputs.nixpkgs.follows = "/nixpkgs";
     };
+    my-nixpkgs.url = "git+file:///home/qaristote/code/nix/my-nixpkgs";
   };
 
-  outputs = { self, nixpkgs, personal-webpage, flake-utils, ... }@attrs:
-    flake-utils.lib.eachDefaultSystem (system: {
-      overlays.default = final: prev: {
-        personal = import ./pkgs { pkgs = final; } // {
-          webpage = personal-webpage.defaultPackage."${system}";
-        };
+  outputs = { self, nixpkgs, my-nixpkgs, personal-webpage, ... }: {
+    nixosConfigurations = let
+      system = "x86_64-linux";
+      commonModules = [
+        my-nixpkgs.nixosModules.personal
+        ({ ... }: {
+          nixpkgs.overlays =
+            [ my-nixpkgs.overlays.personal personal-webpage.overlays.default ];
+        })
+      ];
+    in {
+      hermes = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = commonModules
+          ++ [ ./config ./config/hardware-configuration.nix ];
       };
-    }) // {
-      nixosModules.default = import ./modules;
-      nixosConfigurations = let
-        system = "x86_64-linux";
-        specialArgs = attrs;
-        commonModules = [
-          self.nixosModules.default
-          ({ ... }: {
-            nixpkgs.overlays = [ self.overlays."${system}".default ];
-          })
-        ];
-      in {
-        hermes = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
-          modules = commonModules ++ [ ./config ./hardware-configuration.nix ];
-        };
-        hermes-test = nixpkgs.lib.nixosSystem {
-          inherit system specialArgs;
-          modules = commonModules ++ [ ./tests/configuration.nix ];
-        };
+      hermes-test = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = commonModules ++ [ ./tests/configuration.nix ];
       };
     };
+  };
 }