From 5bd52383ae779a9a9fbc81fcce63ea4242f79659 Mon Sep 17 00:00:00 2001
From: Dave Gallant <dave.gallant@gmail.com>
Date: Sun, 10 Mar 2024 12:19:26 -0400
Subject: [PATCH] Remove outputs.nix

---
 flake.nix   | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 outputs.nix | 124 ---------------------------------------------------
 2 files changed, 125 insertions(+), 125 deletions(-)
 delete mode 100644 outputs.nix

diff --git a/flake.nix b/flake.nix
index 5af0b11..c5508ea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,5 +23,129 @@
     };
   };
 
-  outputs = { ... } @ args: import ./outputs.nix args;
+  outputs =
+    { self
+    , darwin
+    , home-manager
+    , nixpkgs
+    , nixpkgs-unstable
+    , nixos-hardware
+    , nix-ld
+    , ...
+    } @ inputs: {
+      nixosConfigurations =
+        let
+          modulesDir = ./modules;
+          unstable = import nixpkgs-unstable {
+            system = "x86_64-linux";
+            config.allowUnfree = true;
+            config.permittedInsecurePackages = [ ];
+          };
+          defaultModules = [
+            home-manager.nixosModules.home-manager
+            ./fonts.nix
+            ./packages.nix
+            ./upgrade-diff.nix
+
+            ({ config
+             , lib
+             , lib'
+             , ...
+             }: {
+              config = {
+                _module.args = {
+                  lib' = lib // import ./lib { inherit config lib; };
+                };
+
+                nix = {
+                  settings = {
+                    auto-optimise-store = true;
+                    sandbox = false;
+                    substituters = [ "https://davegallant.cachix.org" ];
+                    trusted-users = [ "root" "dave" ];
+                    trusted-public-keys = [
+                      "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
+                    ];
+                  };
+                  registry = { nixpkgs.flake = nixpkgs; };
+                  gc = {
+                    automatic = true;
+                    dates = "daily";
+                    options = "--delete-older-than 14d";
+                  };
+                };
+
+                nixpkgs.overlays = [
+                  (import ./overlays)
+                ];
+
+                home-manager = {
+                  useGlobalPkgs = true;
+                  useUserPackages = true;
+                  users.dave.imports = [
+                    ./home/default.nix
+                    inputs.nixvim.homeManagerModules.nixvim
+                  ];
+                  extraSpecialArgs = {
+                    inherit unstable;
+                  };
+                };
+              };
+            })
+          ];
+        in
+        {
+          hephaestus = nixpkgs.lib.nixosSystem {
+            specialArgs = { inherit unstable; };
+            modules =
+              [
+                ./machines/hephaestus/configuration.nix
+                ./services/netdata/default.nix
+              ]
+              ++ defaultModules;
+          };
+        };
+
+      darwinConfigurations =
+        let
+          system = "aarch64-darwin";
+          unstable = import nixpkgs-unstable {
+            config.allowUnfree = true;
+            inherit system;
+          };
+        in
+        {
+          zelus = darwin.lib.darwinSystem {
+            inherit system;
+            specialArgs = { inherit unstable; };
+
+            modules = [
+              home-manager.darwinModules.home-manager
+              ./darwin.nix
+              ./machines/zelus/configuration.nix
+              ./packages.nix
+              ./upgrade-diff.nix
+
+              ({ config, ... }: {
+                config = {
+                  nixpkgs.overlays = [
+                    (import ./overlays)
+                  ];
+                  home-manager = {
+                    useGlobalPkgs = true;
+                    useUserPackages = true;
+                    users."dave.gallant".imports = [
+                      ./home/default.nix
+                      inputs.nixvim.homeManagerModules.nixvim
+                    ];
+                    extraSpecialArgs = {
+                      inherit unstable;
+                    };
+                  };
+                };
+              })
+            ];
+          };
+        };
+    };
 }
diff --git a/outputs.nix b/outputs.nix
deleted file mode 100644
index a17379b..0000000
--- a/outputs.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{ self
-, darwin
-, home-manager
-, nixpkgs
-, nixpkgs-unstable
-, nixos-hardware
-, nix-ld
-, ...
-} @ inputs: {
-  nixosConfigurations =
-    let
-      modulesDir = ./modules;
-      unstable = import nixpkgs-unstable {
-        system = "x86_64-linux";
-        config.allowUnfree = true;
-        config.permittedInsecurePackages = [ ];
-      };
-      defaultModules = [
-        home-manager.nixosModules.home-manager
-        ./fonts.nix
-        ./packages.nix
-        ./upgrade-diff.nix
-
-        ({ config
-         , lib
-         , lib'
-         , ...
-         }: {
-          config = {
-            _module.args = {
-              lib' = lib // import ./lib { inherit config lib; };
-            };
-
-            nix = {
-              settings = {
-                auto-optimise-store = true;
-                sandbox = false;
-                substituters = [ "https://davegallant.cachix.org" ];
-                trusted-users = [ "root" "dave" ];
-                trusted-public-keys = [
-                  "davegallant.cachix.org-1:SsUMqL4+tF2R3/G6X903E9laLlY1rES2QKFfePegF08="
-                ];
-              };
-              registry = { nixpkgs.flake = nixpkgs; };
-              gc = {
-                automatic = true;
-                dates = "daily";
-                options = "--delete-older-than 14d";
-              };
-            };
-
-            nixpkgs.overlays = [
-              (import ./overlays)
-            ];
-
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users.dave.imports = [
-                ./home/default.nix
-                inputs.nixvim.homeManagerModules.nixvim
-              ];
-              extraSpecialArgs = {
-                inherit unstable;
-              };
-            };
-          };
-        })
-      ];
-    in
-    {
-      hephaestus = nixpkgs.lib.nixosSystem {
-        specialArgs = { inherit unstable; };
-        modules =
-          [
-            ./machines/hephaestus/configuration.nix
-            ./services/netdata/default.nix
-          ]
-          ++ defaultModules;
-      };
-    };
-
-  darwinConfigurations =
-    let
-      system = "aarch64-darwin";
-      unstable = import nixpkgs-unstable {
-        config.allowUnfree = true;
-        inherit system;
-      };
-    in
-    {
-      zelus = darwin.lib.darwinSystem {
-        inherit system;
-        specialArgs = { inherit unstable; };
-
-        modules = [
-          home-manager.darwinModules.home-manager
-          ./darwin.nix
-          ./machines/zelus/configuration.nix
-          ./packages.nix
-          ./upgrade-diff.nix
-
-          ({ config, ... }: {
-            config = {
-              nixpkgs.overlays = [
-                (import ./overlays)
-              ];
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                users."dave.gallant".imports = [
-                  ./home/default.nix
-                  inputs.nixvim.homeManagerModules.nixvim
-                ];
-                extraSpecialArgs = {
-                  inherit unstable;
-                };
-              };
-            };
-          })
-        ];
-      };
-    };
-}