diff options
| -rw-r--r-- | nixos/modules/module-list.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/catbus-networkpresence.nix (renamed from nixos/modules/services/catbus-observer-networkpresence.nix) | 8 | ||||
| -rw-r--r-- | nixos/modules/services/catbus-wakeonlan.nix (renamed from nixos/modules/services/catbus-actuator-wakeonlan.nix) | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 83566f5..d3952f1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -5,10 +5,10 @@ ./overlays.nix ./programs/dwm.nix ./services/ambience.nix - ./services/catbus-actuator-wakeonlan.nix ./services/catbus-lgtv.nix - ./services/catbus-observer-networkpresence.nix + ./services/catbus-networkpresence.nix ./services/catbus-snapcast.nix + ./services/catbus-wakeonlan.nix ./services/dlnatoad.nix ./services/helix-directory-jackalope.nix ./services/helix-directory.nix diff --git a/nixos/modules/services/catbus-observer-networkpresence.nix b/nixos/modules/services/catbus-networkpresence.nix index da54956..e69550c 100644 --- a/nixos/modules/services/catbus-observer-networkpresence.nix +++ b/nixos/modules/services/catbus-networkpresence.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.eth.services.catbus-observer-networkpresence; + cfg = config.eth.services.catbus-networkpresence; configJSON = pkgs.writeText "config.json" (builtins.toJSON { mqttBroker = cfg.mqttBroker; @@ -12,7 +12,7 @@ let in { - options.eth.services.catbus-observer-networkpresence = { + options.eth.services.catbus-networkpresence = { enable = mkEnableOption "Whether to enable the Catbus network-presence observer"; @@ -54,11 +54,11 @@ in { assertions = [ { assertion = cfg.interface != ""; - message = "must set config.eth.services.catbus-observer-networkpresence.interface"; + message = "must set config.eth.services.catbus-networkpresence.interface"; } ]; - systemd.services.catbus-observer-networkpresence = { + systemd.services.catbus-networkpresence-observer = { enable = true; description = "Detect devices on the network to publish to Catbus"; wants = [ "network.target" ]; diff --git a/nixos/modules/services/catbus-actuator-wakeonlan.nix b/nixos/modules/services/catbus-wakeonlan.nix index c78f974..0cf7edb 100644 --- a/nixos/modules/services/catbus-actuator-wakeonlan.nix +++ b/nixos/modules/services/catbus-wakeonlan.nix @@ -3,7 +3,7 @@ with lib; let - cfg = config.eth.services.catbus-actuator-wakeonlan; + cfg = config.eth.services.catbus-wakeonlan; configJSON = pkgs.writeText "config.json" (builtins.toJSON { mqttBroker = cfg.mqttBroker; @@ -12,7 +12,7 @@ let in { - options.eth.services.catbus-actuator-wakeonlan = { + options.eth.services.catbus-wakeonlan = { enable = mkEnableOption "Whether to enable the Catbus Wake-On-LAN actuator"; @@ -44,7 +44,7 @@ in { config = mkIf cfg.enable { - systemd.services.catbus-actuator-wakeonlan = { + systemd.services.catbus-wakeonlan-actuator = { enable = true; description = "Power devices on using Wake-On-LAN via Catbus"; wants = [ "network.target" ]; |