2024-04-21

1 files changed, 5 insertions, 22 deletions

diff --git a/flake.nix b/flake.nix
index e6666d9..adb7416 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,11 +12,6 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
-    darwin = {
-      url = "github:LnL7/nix-darwin";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -36,7 +31,6 @@
     agenix = {
       url = "github:ryantm/agenix";
       inputs = {
-        darwin.follows = "darwin";
         home-manager.follows = "home-manager";
         nixpkgs.follows = "nixpkgs";
         systems.follows = "systems";
@@ -155,17 +149,10 @@
         program = "${self.packages.${system}.default}/bin/nixfiles";
       };
 
-      # NOTE Leave this commented out because otherthise `nix flake check`
-      # complains a lot.
-      # packages =
-      #   let
-      #     buildIsoImage = name: self.nixosConfigurations.${name}.config.system.build.isoImage;
-      #   in
-      #   {
-      #     default = self.legacyPackages.${system}.nixfiles;
-      #     iso-arm = buildIsoImage "iso-arm";
-      #     iso-x86 = buildIsoImage "iso-x86";
-      #   };
+      packages = {
+        default = self.legacyPackages.${system}.nixfiles;
+        iso = self.nixosConfigurations.iso.config.system.build.isoImage;
+      };
 
       legacyPackages = import nixpkgs {
         inherit system;
@@ -186,14 +173,10 @@
     // {
       lib = nixpkgs.lib.extend (import ./lib);
 
-      modules.nixfiles = import ./modules/common;
+      nixosModules.nixfiles = import ./modules;
 
-      nixosModules.nixfiles = import ./modules/nixos;
       nixosConfigurations = import ./nixosConfigurations inputs;
 
-      darwinModules.nixfiles = import ./modules/darwin;
-      darwinConfigurations = import ./darwinConfigurations inputs;
-
       overlays.default = final: prev: import ./overlay.nix final prev;
     };
 }