diff --git a/flake.lock b/flake.lock index 84d7b6a..9c9f52c 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1740932899, + "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bb5415c..3654010 100644 --- a/flake.nix +++ b/flake.nix @@ -57,15 +57,6 @@ system = "x86_64-linux"; specialArgs = { inputs = inputs; - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.permittedInsecurePackages = [ - "aspnetcore-runtime-6.0.36" - "aspnetcore-runtime-wrapped-6.0.36" - "dotnet-sdk-6.0.428" - "dotnet-sdk-wrapped-6.0.428" - ]; - }; pkgs-4a3fc4cf7 = import nixpkgs-4a3fc4cf7 { inherit system; }; diff --git a/systems/LoutreOS/medias.nix b/systems/LoutreOS/medias.nix index c2a7004..fdd6518 100644 --- a/systems/LoutreOS/medias.nix +++ b/systems/LoutreOS/medias.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs-unstable, pkgs-4a3fc4cf7, ... }: +{ config, lib, pkgs, pkgs-4a3fc4cf7, ... }: { services = { @@ -18,28 +18,10 @@ }; }; - radarr = { - enable = true; - package = pkgs-unstable.radarr; - }; - sonarr = { - enable = true; - package = pkgs-unstable.sonarr; - }; - flaresolverr = { - enable = false; - package = pkgs-unstable.flaresolverr; - }; - prowlarr = { - enable = true; - package = pkgs-unstable.prowlarr; - }; - - jellyfin = { - enable = true; - package = pkgs-unstable.jellyfin; - }; - + radarr.enable = true; + sonarr.enable = true; + prowlarr.enable = true; + jellyfin.enable = true; slimserver.enable = true; }; diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index f373e0a..e21499a 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -183,7 +183,10 @@ in zigbee2mqtt = { enable = true; settings = { - serial.port = "/dev/serial/by-id/usb-Texas_Instruments_TI_CC2531_USB_CDC___0X00124B0014D97058-if00"; + serial = { + port = "/dev/serial/by-id/usb-Texas_Instruments_TI_CC2531_USB_CDC___0X00124B0014D97058-if00"; + adapter = "zstack"; + }; mqtt = { server = "mqtt://${(head config.services.mosquitto.listeners).address}:${toString (head config.services.mosquitto.listeners).port}"; };