diff --git a/3modules/default.nix b/3modules/default.nix index e7d3ecd..ec659ef 100644 --- a/3modules/default.nix +++ b/3modules/default.nix @@ -7,7 +7,7 @@ _: ./deluge.nix ./etherpad.nix ./forward-journal.nix - ./netdata.nix + #./netdata.nix ./opentracker.nix ./ps3netsrv.nix ./logging-config.nix diff --git a/3modules/deluge.nix b/3modules/deluge.nix index bbdd184..a59aea3 100644 --- a/3modules/deluge.nix +++ b/3modules/deluge.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: -# based on /nixos/modules/services/torrent/deluge.nix -with import ; +{ config, lib, pkgs, stockholm, ... }: + +with stockholm.lib; let cfg_daemon = config.makefu.deluge; diff --git a/3modules/forward-journal.nix b/3modules/forward-journal.nix index f501048..685a173 100644 --- a/3modules/forward-journal.nix +++ b/3modules/forward-journal.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import ; +with stockholm.lib; let cfg = config.makefu.forward-journal; diff --git a/3modules/logging-config.nix b/3modules/logging-config.nix index a77e32e..593b829 100644 --- a/3modules/logging-config.nix +++ b/3modules/logging-config.nix @@ -1,6 +1,6 @@ -{config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import ; +with stockholm.lib; { options.makefu.stats-server = lib.mkOption { type = types.str; diff --git a/3modules/opentracker.nix b/3modules/opentracker.nix index 6c65b82..bb00f53 100644 --- a/3modules/opentracker.nix +++ b/3modules/opentracker.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import ; +with stockholm.lib; let cfg = config.makefu.opentracker; diff --git a/3modules/ps3netsrv.nix b/3modules/ps3netsrv.nix index a0a6eb1..0a7e773 100644 --- a/3modules/ps3netsrv.nix +++ b/3modules/ps3netsrv.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import ; +with stockholm.lib; let cfg = config.makefu.ps3netsrv; diff --git a/3modules/snapraid.nix b/3modules/snapraid.nix index 1a2c084..7ffe851 100644 --- a/3modules/snapraid.nix +++ b/3modules/snapraid.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import ; +with stockholm.lib; let # returns dirname without / , used as disk name @@ -101,7 +101,7 @@ let # for scrubbing,fixing pkgs.snapraid ]; - krebs.on-failure.plans.snapraid-sync.name = "snapraid-sync"; + # krebs.on-failure.plans.snapraid-sync.name = "snapraid-sync"; environment.etc."snapraid.conf".text = snapraid-conf; systemd.timers.snapraid-sync = { description = "snapraid sync timer"; diff --git a/3modules/udpt.nix b/3modules/udpt.nix index 18f56ab..2fde62d 100644 --- a/3modules/udpt.nix +++ b/3modules/udpt.nix @@ -1,6 +1,7 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm,... }: -with import ; +with lib; +with stockholm.lib; let cfg = config.makefu.udpt;