From ee5c6141b0505df33036c91276ab13b0b5baa4c2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 5 May 2019 10:30:30 +0200
Subject: [PATCH] Move unneeded system packages to a better place

---
 nixops/eldiron.nix                        | 7 +++++--
 nixops/modules/websites/commons/stats.nix | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 718d483..d62f022 100644
--- 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 c707303..88559b1 100644
--- 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" ''
-- 
2.41.0