From 77c0e6b31abb8f29fe533a90640865630992b681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 17 Mar 2024 19:38:50 +0100 Subject: [PATCH] make installer nixos module stand-alone --- nixosModules/flake-module.nix | 6 +++++- pkgs/installer/flake-module.nix | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixosModules/flake-module.nix b/nixosModules/flake-module.nix index 4fb480ea..9d75e27e 100644 --- a/nixosModules/flake-module.nix +++ b/nixosModules/flake-module.nix @@ -1,7 +1,11 @@ { inputs, self, ... }: { flake.nixosModules = { hidden-ssh-announce.imports = [ ./hidden-ssh-announce.nix ]; - installer.imports = [ ./installer ]; + installer.imports = [ + ./installer + self.nixosModules.hidden-ssh-announce + inputs.disko.nixosModules.disko + ]; clanCore.imports = [ inputs.sops-nix.nixosModules.sops ./clanCore diff --git a/pkgs/installer/flake-module.nix b/pkgs/installer/flake-module.nix index 8327591e..74ffaec2 100644 --- a/pkgs/installer/flake-module.nix +++ b/pkgs/installer/flake-module.nix @@ -3,9 +3,7 @@ let installerModule = { config, pkgs, ... }: { imports = [ self.nixosModules.installer - self.nixosModules.hidden-ssh-announce self.inputs.nixos-generators.nixosModules.all-formats - self.inputs.disko.nixosModules.disko ]; system.stateVersion = config.system.nixos.version;