m 2: rename stats and share

10 files changed, 11 insertions, 8 deletions

diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index ddff9f78..fb4fac3f 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -32,7 +32,7 @@ in {
       ../2configs/tools/sec.nix
 
       # services
-      ../2configs/gum-share.nix
+      ../2configs/share/gum.nix
       ../2configs/sabnzbd.nix
       ../2configs/torrent.nix
       ../2configs/iodined.nix
@@ -64,8 +64,8 @@ in {
       ../2configs/syncthing.nix
 
       # ../2configs/opentracker.nix
-      ../2configs/logging/central-stats-client.nix
-      # ../2configs/logging/central-logging-client.nix
+      ../2configs/stats/client.nix
+      # ../2configs/logging/client.nix
 
   ];
   makefu.dl-dir = "/var/download";
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index 91785a07..0f1b8e0d 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -50,11 +50,13 @@ in {
       # ../2configs/disable_v6.nix
       #../2configs/graphite-standalone.nix
       #../2configs/share-user-sftp.nix
-      ../2configs/omo-share.nix
+      ../2configs/share/omo.nix
       ../2configs/tinc/retiolum.nix
-      ../2configs/logging/central-stats-server.nix
-      # ../2configs/logging/central-logging-server.nix
-      ../2configs/logging/central-stats-client.nix
+
+      # Logging
+      ../2configs/stats/server.nix #influx + grafana
+      ../2configs/stats/client.nix
+      ../2configs/stats/external/aralast.nix # logs to influx
 
       # services
       ../2configs/syncthing.nix
@@ -180,7 +182,8 @@ in {
     uid = 9002;
     name = "misa";
   };
-  hardware.enableAllFirmware = true;
+  # hardware.enableAllFirmware = true;
+  hardware.enableRedistributableFirmware = true;
   hardware.cpu.intel.updateMicrocode = true;
 
   zramSwap.enable = true;
diff --git a/makefu/2configs/logging/central-logging-client.nix b/makefu/2configs/logging/client.nix
index 04d2de0d..04d2de0d 100644
--- a/makefu/2configs/logging/central-logging-client.nix
+++ b/makefu/2configs/logging/client.nix
diff --git a/makefu/2configs/logging/central-logging-server.nix b/makefu/2configs/logging/server.nix
index 90f8e668..90f8e668 100644
--- a/makefu/2configs/logging/central-logging-server.nix
+++ b/makefu/2configs/logging/server.nix
diff --git a/makefu/2configs/gum-share.nix b/makefu/2configs/share/gum.nix
index e578f43d..e578f43d 100644
--- a/makefu/2configs/gum-share.nix
+++ b/makefu/2configs/share/gum.nix
diff --git a/makefu/2configs/omo-share.nix b/makefu/2configs/share/omo.nix
index 7d7a4ec5..7d7a4ec5 100644
--- a/makefu/2configs/omo-share.nix
+++ b/makefu/2configs/share/omo.nix
diff --git a/makefu/2configs/temp-share-samba.nix b/makefu/2configs/share/temp-share-samba.nix
index 0907c2db..0907c2db 100644
--- a/makefu/2configs/temp-share-samba.nix
+++ b/makefu/2configs/share/temp-share-samba.nix
diff --git a/makefu/2configs/logging/central-stats-client.nix b/makefu/2configs/stats/client.nix
index dd6dddda..dd6dddda 100644
--- a/makefu/2configs/logging/central-stats-client.nix
+++ b/makefu/2configs/stats/client.nix
diff --git a/makefu/2configs/logging/external/aralast.nix b/makefu/2configs/stats/external/aralast.nix
index c335db45..c335db45 100644
--- a/makefu/2configs/logging/external/aralast.nix
+++ b/makefu/2configs/stats/external/aralast.nix
diff --git a/makefu/2configs/logging/central-stats-server.nix b/makefu/2configs/stats/server.nix
index 602fcc6d..602fcc6d 100644
--- a/makefu/2configs/logging/central-stats-server.nix
+++ b/makefu/2configs/stats/server.nix