Compare commits

..

No commits in common. "bf14ada5fd68d6b602f84a7047564eafd77c4288" and "8456ea32af11c6d8691d6063cc58509b36772e7f" have entirely different histories.

8 changed files with 4 additions and 64 deletions

View file

@ -1 +1 @@
{ boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; } { ... }: { boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; }

View file

@ -11,7 +11,6 @@
}; };
nixpkgs.overlays = [ nixpkgs.overlays = [
(import ../../overlays/recyclarr.nix) (import ../../overlays/recyclarr.nix)
(import ../../overlays/zwave-js-ui.nix)
]; ];
system.autoUpgrade = { system.autoUpgrade = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
{ { ... }: {
systemd.network.enable = true; systemd.network.enable = true;
networking.useNetworkd = true; networking.useNetworkd = true;
services.resolved = { services.resolved = {

View file

@ -1,4 +1,4 @@
{ { ... }: {
services.smartd = { services.smartd = {
enable = true; enable = true;
defaults.monitored = "-a -o on -s (S/../.././02|L/../../7/04)"; defaults.monitored = "-a -o on -s (S/../.././02|L/../../7/04)";

View file

@ -1,30 +0,0 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkIf mkEnableOption mkOption types;
cfg = config.services.zwave-js-ui;
in
{
options.services.zwave-js-ui = {
enable = mkEnableOption "zwave-js-ui";
store = mkOption {
type = types.path;
default = "/var/lib/zwave-js-ui";
description = ''
Where zwave-js-ui information will be stored
'';
};
};
config = mkIf cfg.enable {
assertions = [{
assertion = !config.services.zwave-js.enable;
message = "zwave-js-ui conflicts with zwave-js";
}];
systemd.services.zwave-js-ui = {
environment = {
STORE_DIR = cfg.store;
ZWAVEJS_EXTERNAL_CONFIG = "${cfg.store}/.config-db";
};
script = "${pkgs.zwave-js-ui}/bin/zwave-js-ui";
};
};
}

View file

@ -1,4 +0,0 @@
final: prev:
{
zwave-js-ui = ( prev.callPackage ../pkgs/zwave-js-ui.nix {} );
}

View file

@ -1,21 +0,0 @@
{ lib, buildNpmPackage, fetchFromGitHub }:
buildNpmPackage rec {
pname = "zwave-js-ui";
version = "9.17.0";
src = fetchFromGitHub {
owner = "zwave-js";
repo = pname;
rev = "v${version}";
hash = "sha256-GCBVRjDpiC8WhPHFwKnzyO5I09TDx3IbxpUZvwDu2u0=";
};
npmDepsHash = "sha256-YtHiBVz2eyHyJkr4K1NZXVZKdZTmdGMDFGpEC0QUCMU=";
meta = {
description = "Full featured Z-Wave Control Panel and MQTT Gateway.";
homepage = "https://zwave-js.github.io/zwave-js-ui/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [cdombroski];
};
}

View file

@ -147,11 +147,7 @@
extraOptions = [ "--pull=newer" "--network=www" ]; extraOptions = [ "--pull=newer" "--network=www" ];
}; };
zwave-js-ui = { zwave-js-ui = {
image = "my-zwave-js-ui"; image = "docker.io/zwavejs/zwave-js-ui:latest";
imageFile = pkgs.dockerTools.buildImage {
name = "my-zwave-js-ui";
config.Cmd = "${pkgs.zwave-js-ui}/bin/zwave-js-ui";
};
volumes = [ "zwave-config:/usr/src/app/store" ]; volumes = [ "zwave-config:/usr/src/app/store" ];
environment.TZ = "America/New_York"; environment.TZ = "America/New_York";
labels = { labels = {