X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=nixops%2Feldiron.nix;h=51af1f626622c55f0d9ab62bac7537bb144c0360;hb=8d213e2b1c934f6861f76aad5eb7c11097fa97de;hp=a85b9dea599e4e1558e8fcc0db41e290ee03568d;hpb=44742a43dac86a79274486a9b73a349c5d4ec631;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index a85b9de..51af1f6 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -5,18 +5,10 @@
     enableRollback = true;
   };
 
-  eldiron = { config, pkgs, mylibs, myconfig, ... }:
+  eldiron = { config, pkgs, myconfig, ... }:
   {
-    _module.args = {
-      pkgsNext = import <nixpkgsNext> {};
-      pkgsPrevious = import <nixpkgsPrevious> {};
-      mylibs = import ../libs.nix { nixpkgs = pkgs; };
-      mypkgs = import ../default.nix;
-      myconfig = {
-        inherit privateFiles;
-        env = import "${privateFiles}/environment.nix";
-      };
-    };
+    boot.kernelPackages = pkgs.linuxPackages_latest;
+    _module.args.privateFiles = privateFiles;
 
     networking = {
       firewall.enable = true;
@@ -29,37 +21,15 @@
         myconfig.env.servers.eldiron.ips);
     };
 
-    imports = [
-      ./modules/ssh
-      ./modules/certificates.nix
-      ./modules/gitolite
-      ./modules/databases
-      ./modules/mpd
-      ./modules/websites
-      ./modules/mail
-      ./modules/ftp
-      ./modules/pub
-      ./modules/task
-      ./modules/irc
-      ./modules/buildbot
-      ./modules/dns
-      ./modules/secrets
-    ];
-    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;
+    imports = builtins.attrValues (import ../modules);
 
-    services.journald.extraConfig = ''
-      MaxLevelStore="warning"
-      MaxRetentionSec="1year"
-      '';
+    myServices.buildbot.enable = true;
+    myServices.databases.enable = true;
+    myServices.gitolite.enable = true;
+    myServices.irc.enable = true;
+    myServices.pub.enable = true;
+    myServices.tasks.enable = true;
+    services.pure-ftpd.enable = true;
 
     deployment = {
       targetEnv = "hetzner";
@@ -81,13 +51,6 @@
       };
     };
 
-    environment.systemPackages = [
-      pkgs.telnet
-      pkgs.htop
-      pkgs.vim
-      pkgs.iftop
-    ];
-
     services.cron = {
       enable = true;
       systemCronJobs = [