X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Feldiron.nix;h=69231d1336278e19bc620325e894e99babdde36e;hb=a1a8649a2be768685eb04c246c114fce36b8096f;hp=7d97377e8746c59b53499814e301dd55ae863f6d;hpb=1a7188052f235fb632700478fad0108e4306107d;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix index 7d97377..69231d1 100644 --- a/nixops/eldiron.nix +++ b/nixops/eldiron.nix @@ -5,13 +5,12 @@ enableRollback = true; }; - eldiron = { config, pkgs, mylibs, myconfig, ... }: + eldiron = { config, pkgs, myconfig, ... }: { nixpkgs.overlays = builtins.attrValues (import ../overlays); _module.args = { pkgsNext = import {}; pkgsPrevious = import {}; - mylibs = import ../libs.nix { inherit pkgs; }; myconfig = { inherit privateFiles; env = import "${privateFiles}/environment.nix"; @@ -35,24 +34,18 @@ ./modules/ssh ./modules/certificates.nix ./modules/gitolite - ./modules/databases ./modules/mpd.nix - ./modules/websites ./modules/mail.nix ./modules/ftp.nix ./modules/pub ./modules/task - ./modules/irc.nix ./modules/buildbot ./modules/dns.nix ] ++ (builtins.attrValues (import ../modules)); + myServices.databases.enable = true; + myServices.irc.enable = true; services.myGitolite.enable = true; - services.myDatabases.enable = true; - services.myWebsites.production.enable = true; - services.myWebsites.integration.enable = true; - services.myWebsites.tools.enable = true; services.pure-ftpd.enable = true; - services.irc.enable = true; services.pub.enable = true; services.myTasks.enable = true; services.buildbot.enable = true;