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

--- a/modules/nixos.nix
+++ b/modules/nixos.nix
@@ -11,7 +11,6 @@
   inherit (lib.attrsets) mapAttrs;
   inherit (lib.options) mkOption;
   inherit (lib.types) deferredModule unspecified;
-  inherit (lib.modules) mkRemovedOptionModule;
   inherit (lib.strings) escapeNixIdentifier;
   inherit (fleetLib.options) mkHostsOption;
 
@@ -55,9 +54,6 @@
         };
       };
       config = {
-        # imports = [
-        #   (mkRemovedOptionModule ["nixosModules"] "replaced with hosts.*.nixos.imports.")
-        # ];
         nixos = let 
           inherit (hostArgs.config) system;
         in {
@@ -94,8 +90,5 @@
       };
     });
   };
-  imports = [
-    (mkRemovedOptionModule [ "nixosModules" ] "replaced with nixos.imports.")
-  ];
   config.nixos.imports = import ./nixos/module-list.nix;
 }

--- 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";

7let7let
8  inherit (lib.options) mkOption literalExpression;8  inherit (lib.options) mkOption literalExpression;
9  inherit (lib.types) path;9  inherit (lib.types) path;
10  inherit (lib.modules) mkRemovedOptionModule;
11  inherit (fleetLib.options) mkHostsOption;10  inherit (fleetLib.options) mkHostsOption;
12  inherit (fleetLib.types) listOfOverlay;11  inherit (fleetLib.types) listOfOverlay;
1312
43        default = config.nixpkgs.buildUsing;42        default = config.nixpkgs.buildUsing;
44        defaultText = literalExpression "config.nixpkgs.buildUsing";43        defaultText = literalExpression "config.nixpkgs.buildUsing";
45      };44      };
46      # imports = [
47      # 	(mkRemovedOptionModule ["nixpkgs" "overlays"] "this option needs to be specified at nixosModules level")
48      # ];
49      config.nixos = {45      config.nixos = {
50        inherit _file;46        inherit _file;
51        nixpkgs.overlays = config.nixpkgs.overlays;47        nixpkgs.overlays = config.nixpkgs.overlays;
52        imports = [
53          (mkRemovedOptionModule [
54            "nixpkgs"
55            "buildUsing"
56          ] "this option should be specified at the host level, not the nixosModules level")
57        ];
58      };48      };
59    };49    };
60  };50  };