diff options
| author | makefu <github@syntax-fehler.de> | 2023-06-13 00:28:45 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2023-06-13 00:28:45 +0200 |
| commit | 9d8d0ae0dac1baddb05b8877f05548b96899ebc6 (patch) | |
| tree | 6572fc6ae7288291530263e79e2e93b505cf1355 | |
| parent | 4dd3763d0333d24c17e60fc205619ef7ce7e1770 (diff) | |
modules: remove nixpath-style imports
| -rw-r--r-- | 3modules/default.nix | 2 | ||||
| -rw-r--r-- | 3modules/deluge.nix | 6 | ||||
| -rw-r--r-- | 3modules/forward-journal.nix | 4 | ||||
| -rw-r--r-- | 3modules/logging-config.nix | 4 | ||||
| -rw-r--r-- | 3modules/opentracker.nix | 4 | ||||
| -rw-r--r-- | 3modules/ps3netsrv.nix | 4 | ||||
| -rw-r--r-- | 3modules/snapraid.nix | 6 | ||||
| -rw-r--r-- | 3modules/udpt.nix | 5 |
8 files changed, 18 insertions, 17 deletions
diff --git a/3modules/default.nix b/3modules/default.nix index e7d3ecd58..ec659ef5f 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 bbdd18454..a59aea382 100644 --- a/3modules/deluge.nix +++ b/3modules/deluge.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: -# based on <nixpkgs>/nixos/modules/services/torrent/deluge.nix -with import <stockholm/lib>; +{ 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 f501048be..685a17326 100644 --- a/3modules/forward-journal.nix +++ b/3modules/forward-journal.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import <stockholm/lib>; +with stockholm.lib; let cfg = config.makefu.forward-journal; diff --git a/3modules/logging-config.nix b/3modules/logging-config.nix index a77e32e48..593b829e0 100644 --- a/3modules/logging-config.nix +++ b/3modules/logging-config.nix @@ -1,6 +1,6 @@ -{config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import <stockholm/lib>; +with stockholm.lib; { options.makefu.stats-server = lib.mkOption { type = types.str; diff --git a/3modules/opentracker.nix b/3modules/opentracker.nix index 6c65b82b6..bb00f5327 100644 --- a/3modules/opentracker.nix +++ b/3modules/opentracker.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import <stockholm/lib>; +with stockholm.lib; let cfg = config.makefu.opentracker; diff --git a/3modules/ps3netsrv.nix b/3modules/ps3netsrv.nix index a0a6eb1f4..0a7e7732c 100644 --- a/3modules/ps3netsrv.nix +++ b/3modules/ps3netsrv.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import <stockholm/lib>; +with stockholm.lib; let cfg = config.makefu.ps3netsrv; diff --git a/3modules/snapraid.nix b/3modules/snapraid.nix index 1a2c08475..7ffe851d2 100644 --- a/3modules/snapraid.nix +++ b/3modules/snapraid.nix @@ -1,6 +1,6 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm, ... }: -with import <stockholm/lib>; +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 18f56ab6b..2fde62d5e 100644 --- a/3modules/udpt.nix +++ b/3modules/udpt.nix @@ -1,6 +1,7 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, stockholm,... }: -with import <stockholm/lib>; +with lib; +with stockholm.lib; let cfg = config.makefu.udpt; |