diff --git a/base.nix b/base.nix index 1af8358..a0743ab 100644 --- a/base.nix +++ b/base.nix @@ -2,7 +2,11 @@ { imports = [ + # recettes ./base/base.nix ./desktop/desktop.nix + + # moulinette de configuration + ./config-generator.nix ]; } diff --git a/base/base.nix b/base/base.nix index f0397a7..803aa0e 100644 --- a/base/base.nix +++ b/base/base.nix @@ -9,6 +9,14 @@ ./services.nix # inclusion conditionnelle - ./config-generator.nix + ./activation-manuelle/auto-upgrade.nix + ./activation-manuelle/laptop.nix + ./activation-manuelle/locate.nix + ./activation-manuelle/fail2ban.nix + ./activation-manuelle/nix-serve-client.nix + ./activation-manuelle/nix-serve-server.nix + ./activation-manuelle/print.nix + ./activation-manuelle/swap.nix + ./activation-manuelle/users.nix ]; } diff --git a/base/config-generator.nix b/config-generator.nix similarity index 95% rename from base/config-generator.nix rename to config-generator.nix index b431fe7..67cbcbc 100644 --- a/base/config-generator.nix +++ b/config-generator.nix @@ -9,19 +9,7 @@ let host = config.networking.hostName; in - { - imports = [ - ./activation-manuelle/auto-upgrade.nix - ./activation-manuelle/laptop.nix - ./activation-manuelle/locate.nix - ./activation-manuelle/fail2ban.nix - ./activation-manuelle/nix-serve-client.nix - ./activation-manuelle/nix-serve-server.nix - ./activation-manuelle/print.nix - ./activation-manuelle/swap.nix - ./activation-manuelle/users.nix - ]; - +{ ###### interface options = {