Move phpldapadmin to pkgs

[perso/Immae/Config/Nix.git] / nixops / eldiron.nix

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index c1ccc42688a7794c7f5b35e202ebacfe660884d2..d62f022b759ca14879fa70d92816f52b29e0bccb 100644 (file)
--- 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";
@@ -83,13 +83,16 @@
       };
     };
 
-    environment.systemPackages = [
+    users.users.root.packages = [
       pkgs.telnet
       pkgs.htop
-      pkgs.vim
       pkgs.iftop
     ];
 
+    environment.systemPackages = [
+      pkgs.vim
+    ];
+
     services.cron = {
       enable = true;
       systemCronJobs = [