diff options
| author | lassulus <lass@blue.r> | 2018-09-18 15:47:03 +0200 |
|---|---|---|
| committer | lassulus <lass@blue.r> | 2018-09-18 15:47:03 +0200 |
| commit | 245994cc7ace5a323c476ccc50fd4026b9353dc4 (patch) | |
| tree | cf4a3d85c768bd1ca18913d17c67e07bcab95db7 /makefu/1systems/omo/config.nix | |
| parent | 1466d3e86abc4d85af6efe5a964df788cf0e36cc (diff) | |
| parent | 8a756c7333e0e7c4a0433d68775f8d7c1a53b8b0 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/omo/config.nix')
| -rw-r--r-- | makefu/1systems/omo/config.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 47e815e77..be49db024 100644 --- a/makefu/1systems/omo/config.nix +++ b/makefu/1systems/omo/config.nix @@ -17,7 +17,10 @@ in { # <stockholm/makefu/2configs/smart-monitor.nix> <stockholm/makefu/2configs/mail-client.nix> <stockholm/makefu/2configs/mosh.nix> + <stockholm/makefu/2configs/tools/core.nix> + <stockholm/makefu/2configs/tools/desktop.nix> <stockholm/makefu/2configs/tools/mobility.nix> + { environment.systemPackages = [ pkgs.esniper ]; } # <stockholm/makefu/2configs/disable_v6.nix> #<stockholm/makefu/2configs/graphite-standalone.nix> #<stockholm/makefu/2configs/share-user-sftp.nix> @@ -33,12 +36,12 @@ in { # logs to influx <stockholm/makefu/2configs/stats/external/aralast.nix> <stockholm/makefu/2configs/stats/telegraf> - <stockholm/makefu/2configs/stats/telegraf/europastats.nix> + # <stockholm/makefu/2configs/stats/telegraf/europastats.nix> + <stockholm/makefu/2configs/stats/telegraf/hamstats.nix> <stockholm/makefu/2configs/stats/arafetch.nix> # services <stockholm/makefu/2configs/syncthing.nix> - <stockholm/makefu/2configs/mqtt.nix> <stockholm/makefu/2configs/remote-build/slave.nix> <stockholm/makefu/2configs/deployment/google-muell.nix> <stockholm/makefu/2configs/virtualisation/docker.nix> @@ -67,8 +70,8 @@ in { # <stockholm/makefu/2configs/temp/rst-issue.nix> ]; - makefu.full-populate = true; - krebs.rtorrent = { + makefu.full-populate = true; + krebs.rtorrent = (builtins.trace (builtins.toJSON config.services.telegraf.extraConfig)) { downloadDir = lib.mkForce "/media/cryptX/torrent"; extraConfig = '' upload_rate = 200 |