Move unneeded system packages to a better place

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 718d483795274763958a873e41f92e0094649e64..d62f022b759ca14879fa70d92816f52b29e0bccb 100644 (file)
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.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 = [

diff --git a/nixops/modules/websites/commons/stats.nix b/nixops/modules/websites/commons/stats.nix
index c70730376b4f06b59c85eb19057a77c63e8fb7fc..88559b1e573d1262c9b26a36c169f68ebd5df3a0 100644 (file)
--- a/nixops/modules/websites/commons/stats.nix
+++ b/nixops/modules/websites/commons/stats.nix
@@ -19,7 +19,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = [
+    users.users.root.packages = [
       pkgs.goaccess
     ];
 
@@ -39,7 +39,7 @@ in {
             for i in /var/log/httpd/access_log-${domain}*.gz; do
               zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE
             done
-            goaccess $TMPFILE --no-progress -o /var/lib/goaccess/${domain}/index.html -p ${conf}
+            ${pkgs.goaccess}/bin/goaccess $TMPFILE --no-progress -o /var/lib/goaccess/${domain}/index.html -p ${conf}
             '';
           in "${d}/bin/stats-${domain}";
         allStats = sites: pkgs.writeScript "stats" ''