summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/omo.nix
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-01 12:49:36 +0200
committerlassulus <lass@lassul.us>2017-06-01 12:49:36 +0200
commite50bc4f3eb3dac13bba4ae6158e839a52455c3c3 (patch)
treeb3c1fc1f3e00312e92e4ab747c31839db665eebd /makefu/1systems/omo.nix
parent73b073c3fe037f31e05828a1071c9b4b19f7a2ff (diff)
parent9e04d0132133840fba14aca194f18925e3f353d5 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/omo.nix')
-rw-r--r--makefu/1systems/omo.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index 91785a078..0f1b8e0da 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;