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

2  ./assertions.nix2  ./assertions.nix
3  ./fleetLib.nix3  ./fleetLib.nix
4  ./hosts.nix4  ./hosts.nix
5  ./meta.nix
6  ./nixos.nix5  ./nixos.nix
7  ./nixpkgs.nix6  ./nixpkgs.nix
8  ./secrets.nix7  ./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

1{ lib, ... }:
2let
3  inherit (lib.modules) mkRemovedOptionModule;
4in
5{1{
6  imports = [
7    (mkRemovedOptionModule [ "tags" ]
8      "tags are now defined at the host level, not the nixos system level for fast filtering without evaluating unnecessary hosts."
9    )
10    (mkRemovedOptionModule [
11      "network"
12    ] "network is now defined at the host level, not the nixos system level")
13  ];
14
15  # Version of environment (fleet scripts such as rollback) already installed on the host2  # Version of environment (fleet scripts such as rollback) already installed on the host
16  config = {3  config = {

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