1 files changed, 7 insertions, 41 deletions

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 69231d1..51af1f6 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -7,17 +7,8 @@
 
   eldiron = { config, pkgs, myconfig, ... }:
   {
-    nixpkgs.overlays = builtins.attrValues (import ../overlays);
-    _module.args = {
-      pkgsNext = import <nixpkgsNext> {};
-      pkgsPrevious = import <nixpkgsPrevious> {};
-      myconfig = {
-        inherit privateFiles;
-        env = import "${privateFiles}/environment.nix";
-      };
-    };
-
     boot.kernelPackages = pkgs.linuxPackages_latest;
+    _module.args.privateFiles = privateFiles;
 
     networking = {
       firewall.enable = true;
@@ -30,30 +21,15 @@
         myconfig.env.servers.eldiron.ips);
     };
 
-    imports = [
-      ./modules/ssh
-      ./modules/certificates.nix
-      ./modules/gitolite
-      ./modules/mpd.nix
-      ./modules/mail.nix
-      ./modules/ftp.nix
-      ./modules/pub
-      ./modules/task
-      ./modules/buildbot
-      ./modules/dns.nix
-    ] ++ (builtins.attrValues (import ../modules));
+    imports = builtins.attrValues (import ../modules);
+
+    myServices.buildbot.enable = true;
     myServices.databases.enable = true;
+    myServices.gitolite.enable = true;
     myServices.irc.enable = true;
-    services.myGitolite.enable = true;
+    myServices.pub.enable = true;
+    myServices.tasks.enable = true;
     services.pure-ftpd.enable = true;
-    services.pub.enable = true;
-    services.myTasks.enable = true;
-    services.buildbot.enable = true;
-
-    services.journald.extraConfig = ''
-      MaxLevelStore="warning"
-      MaxRetentionSec="1year"
-      '';
 
     deployment = {
       targetEnv = "hetzner";
@@ -75,16 +51,6 @@
       };
     };
 
-    users.users.root.packages = [
-      pkgs.telnet
-      pkgs.htop
-      pkgs.iftop
-    ];
-
-    environment.systemPackages = [
-      pkgs.vim
-    ];
-
     services.cron = {
       enable = true;
       systemCronJobs = [