X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Feldiron.nix;h=35ce1812308f6767e6de0e23bacd920c5f2de220;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=c1ccc42688a7794c7f5b35e202ebacfe660884d2;hpb=5010032101ed3bceaa40fb0a631066e8098c1d7e;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index c1ccc42..35ce181 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -7,11 +7,11 @@
 
   eldiron = { config, pkgs, mylibs, myconfig, ... }:
   {
+    nixpkgs.overlays = builtins.attrValues (import ../overlays);
     _module.args = {
       pkgsNext = import <nixpkgsNext> {};
       pkgsPrevious = import <nixpkgsPrevious> {};
-      mylibs = import ../libs.nix { nixpkgs = pkgs; };
-      mypkgs = import ../default.nix;
+      mylibs = import ../libs.nix { inherit pkgs; };
       myconfig = {
         inherit privateFiles;
         env = import "${privateFiles}/environment.nix";
@@ -36,22 +36,18 @@
       ./modules/certificates.nix
       ./modules/gitolite
       ./modules/databases
-      ./modules/mpd
+      ./modules/mpd.nix
       ./modules/websites
-      ./modules/mail
-      ./modules/ftp
+      ./modules/mail.nix
+      ./modules/ftp.nix
       ./modules/pub
       ./modules/task
-      ./modules/irc
+      ./modules/irc.nix
       ./modules/buildbot
-      ./modules/dns
-      ./modules/secrets
-    ];
+      ./modules/dns.nix
+    ] ++ (builtins.attrValues (import ../modules));
     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;
@@ -83,13 +79,16 @@
       };
     };
 
-    environment.systemPackages = [
+    users.users.root.packages = [
       pkgs.telnet
       pkgs.htop
-      pkgs.vim
       pkgs.iftop
     ];
 
+    environment.systemPackages = [
+      pkgs.vim
+    ];
+
     services.cron = {
       enable = true;
       systemCronJobs = [