From ed1d28f20b83c91aa7f4eb2b7819dfad73b1e139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 22 Aug 2023 15:18:37 +0200 Subject: [PATCH] import nixosModules explicitly we need to also import sops-nix for sops --- flake.nix | 2 +- nixosModules/flake-module.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 nixosModules/flake-module.nix diff --git a/flake.nix b/flake.nix index 3d47cb4d..736b29e5 100644 --- a/flake.nix +++ b/flake.nix @@ -30,10 +30,10 @@ ./pkgs/flake-module.nix ./lib/flake-module.nix + ./nixosModules/flake-module.nix ({ self, lib, ... }: { flake.flakeModules = lib.mapAttrs (_: nix: { imports = [ nix ]; }) (self.lib.findNixFiles ./flakeModules); flake.clanModules = lib.mapAttrs (_: nix: { imports = [ nix ]; }) (self.lib.findNixFiles ./clanModules); - flake.nixosModules = lib.mapAttrs (_: nix: { imports = [ nix ]; }) (self.lib.findNixFiles ./nixosModules); }) ]; }); diff --git a/nixosModules/flake-module.nix b/nixosModules/flake-module.nix new file mode 100644 index 00000000..4d79d7d0 --- /dev/null +++ b/nixosModules/flake-module.nix @@ -0,0 +1,6 @@ +{ ... }: { + flake.nixosModules = { + hidden-ssh-announce.imports = [ ./hidden-ssh-announce.nix ]; + installer.imports = [ ./installer.nix ]; + }; +}