git.delta.rocks / jrsonnet / refs/commits / c653e89d0859

--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -2,7 +2,6 @@
   ./assertions.nix
   ./fleetLib.nix
   ./hosts.nix
-  ./meta.nix
   ./nixos.nix
   ./nixpkgs.nix
   ./secrets.nix

11  inherit (lib.attrsets) mapAttrs;11  inherit (lib.attrsets) mapAttrs;
12  inherit (lib.options) mkOption;12  inherit (lib.options) mkOption;
13  inherit (lib.types) deferredModule unspecified;13  inherit (lib.types) deferredModule unspecified;
14  inherit (lib.modules) mkRemovedOptionModule;
15  inherit (lib.strings) escapeNixIdentifier;14  inherit (lib.strings) escapeNixIdentifier;
16  inherit (fleetLib.options) mkHostsOption;15  inherit (fleetLib.options) mkHostsOption;
1716
55        };54        };
56      };55      };
57      config = {56      config = {
58        # imports = [
59        #   (mkRemovedOptionModule ["nixosModules"] "replaced with hosts.*.nixos.imports.")
60        # ];
61        nixos = let 57        nixos = let 
62          inherit (hostArgs.config) system;58          inherit (hostArgs.config) system;
63        in {59        in {
94      };90      };
95    });91    });
96  };92  };
97  imports = [
98    (mkRemovedOptionModule [ "nixosModules" ] "replaced with nixos.imports.")
99  ];
100  config.nixos.imports = import ./nixos/module-list.nix;93  config.nixos.imports = import ./nixos/module-list.nix;
101}94}
10295

--- a/modules/nixos/meta.nix
+++ b/modules/nixos/meta.nix
@@ -1,17 +1,4 @@
-{ lib, ... }:
-let
-  inherit (lib.modules) mkRemovedOptionModule;
-in
 {
-  imports = [
-    (mkRemovedOptionModule [ "tags" ]
-      "tags are now defined at the host level, not the nixos system level for fast filtering without evaluating unnecessary hosts."
-    )
-    (mkRemovedOptionModule [
-      "network"
-    ] "network is now defined at the host level, not the nixos system level")
-  ];
-
   # Version of environment (fleet scripts such as rollback) already installed on the host
   config = {
     environment.etc.FLEET_HOST.text = "1";

--- a/modules/nixpkgs.nix
+++ b/modules/nixpkgs.nix
@@ -7,7 +7,6 @@
 let
   inherit (lib.options) mkOption literalExpression;
   inherit (lib.types) path;
-  inherit (lib.modules) mkRemovedOptionModule;
   inherit (fleetLib.options) mkHostsOption;
   inherit (fleetLib.types) listOfOverlay;
 
@@ -43,18 +42,9 @@
         default = config.nixpkgs.buildUsing;
         defaultText = literalExpression "config.nixpkgs.buildUsing";
       };
-      # imports = [
-      # 	(mkRemovedOptionModule ["nixpkgs" "overlays"] "this option needs to be specified at nixosModules level")
-      # ];
       config.nixos = {
         inherit _file;
         nixpkgs.overlays = config.nixpkgs.overlays;
-        imports = [
-          (mkRemovedOptionModule [
-            "nixpkgs"
-            "buildUsing"
-          ] "this option should be specified at the host level, not the nixosModules level")
-        ];
       };
     };
   };