yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'make installer nixos module stand-alone' (#994) from openssh into main

Browse Source
This commit is contained in:
clan-bot
2024-03-17 18:42:55 +00:00
parent 915ce52355 77c0e6b31a
commit 50aa98c53a
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixosModules/flake-module.nix
View File

@@ -1,7 +1,11 @@
{ inputs, self, ... }: { { inputs, self, ... }: {
flake.nixosModules = { flake.nixosModules = {
hidden-ssh-announce.imports = [ ./hidden-ssh-announce.nix ]; 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 = [ clanCore.imports = [
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
./clanCore ./clanCore

2
pkgs/installer/flake-module.nix
View File

@@ -3,9 +3,7 @@ let
installerModule = { config, pkgs, ... }: { installerModule = { config, pkgs, ... }: {
imports = [ imports = [
self.nixosModules.installer self.nixosModules.installer
self.nixosModules.hidden-ssh-announce
self.inputs.nixos-generators.nixosModules.all-formats self.inputs.nixos-generators.nixosModules.all-formats
self.inputs.disko.nixosModules.disko
]; ];
system.stateVersion = config.system.nixos.version; system.stateVersion = config.system.nixos.version;