diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c7a9a3..dd559bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,3 +23,11 @@ Minor patches - cerulean no longer depends on `nixpkgs`, `base` package set should be set instead - rename `extraModules` -> `modules` - rename `specialArgs` -> `args` + +## v0.2.3-alpha +>[!TODO] +> I've been too focused on upcoming changes... + +## v0.2.4-alpha +- `homeManager` flake reference may now be specified in snowflake +- `` diff --git a/cerulean/nixos/default.nix b/cerulean/nixos/default.nix index 9e28aa5..d585cc5 100644 --- a/cerulean/nixos/default.nix +++ b/cerulean/nixos/default.nix @@ -13,12 +13,11 @@ # limitations under the License. { root, - lib, system, _cerulean, ... } @ args: { - imports = + imports = with _cerulean.inputs; [ # add support for `options.legacyImports` # ./legacy-imports.nix @@ -27,6 +26,9 @@ (import (root + "/nixpkgs.nix")) # options declarations (import ./nixpkgs.nix (args // {contextName = "hosts";})) + + sops-nix.nixosModules.sops + # microvm.nixosModules.microvm ] ++ ( if _cerulean.homeManager != null diff --git a/cerulean/snow/default.nix b/cerulean/snow/default.nix index b1ea663..048572b 100644 --- a/cerulean/snow/default.nix +++ b/cerulean/snow/default.nix @@ -112,8 +112,6 @@ in [ self.nixosModules.default (findImport (root + "/hosts/${name}")) - - # inputs.microvm.nixosModules.microvm ] ++ (groupModules root) ++ node.modules diff --git a/flake.nix b/flake.nix index f5abab0..80faf5c 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,11 @@ url = "github:microvm-nix/microvm.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = {