From 59268d1da3768b4a737c15f21fa62813587cf323 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 30 Jan 2026 22:46:27 -0600 Subject: [PATCH] what --- .../services/homeassistant/default.nix | 106 ++---------------- .../ha-mail-and-packages/default.nix | 2 +- packages/homeassistant/ha-nanokvm/default.nix | 4 +- packages/raspberrypi/linux-rpi/default.nix | 2 +- systems/x86_64-linux/nuc-nixos/default.nix | 4 +- 5 files changed, 15 insertions(+), 103 deletions(-) diff --git a/modules/nixos/homeassistant/services/homeassistant/default.nix b/modules/nixos/homeassistant/services/homeassistant/default.nix index b7fd52b..2e4f589 100644 --- a/modules/nixos/homeassistant/services/homeassistant/default.nix +++ b/modules/nixos/homeassistant/services/homeassistant/default.nix @@ -279,105 +279,15 @@ in # use postgresql instead of sqlite extraPackages = ps: with ps; [ - pkgs.${namespace}.python-roborock - # pkgs.${namespace}.pyvesync - # # Core functionality - # aiohttp - # aiodns - # paho-mqtt - # pillow - # pytz - # pyyaml - # sqlalchemy - - # # Discovery & networking - # zeroconf - # netdisco - # ifaddr - # ssdp - - # # Device protocols - # pyserial # Serial communications - # bluepy # Bluetooth LE - - # # Smart home ecosystems - # mutagen # Media file metadata - # pysonos # Sonos - # pywemo # Belkin WeMo - # python-miio # Xiaomi devices - # python-kasa # TP-Link - - # # Sensors & monitoring - # meteocalc # Weather calculations - # speedtest-cli # Internet speed - - # # Visualization & UI - # matplotlib # Graphing - - # # Security - # bcrypt - # cryptography - # pyjwt - - # # Media - # ha-ffmpeg # Camera streams - - # # Specialized integrations - # python-matter-server # Matter protocol - - # # System integrations - # psutil # System monitoring - + dateparser psycopg2 - # numpy - # hassil - # pyturbojpeg - # paho-mqtt - # pychromecast - # pyatv - # python-otbr-api - # brother - # pyipp - # govee-ble - # adguardhome - # nextcord - # aiogithubapi - # jellyfin-apiclient-python - # pylitterbot - # dateparser - # aionut - # nextcloudmonitor - # ollama - # pynecil - # aiopyarr - # pysabnzbd - # getmac - # zigpy - # bellows # For Zigbee EmberZNet-based adapters - # zigpy-xbee # For XBee adapters - # zigpy-deconz # For ConBee/RaspBee adapters - # pyicloud # iCloud - # pyatv # Apple TV - # opencv-python - # face-recognition - # ibeacon-ble - # gehomesdk - # onedrive-personal-sdk - # pkgs.${namespace}.python-steam - # apple-weatherkit - - # samsungctl - # samsungtvws - - # aiohomekit - - # icmplib - # aioelectricitymaps - # wyoming - # pysmartthings - # wakeonlan - # ephem - ]; + ] + ++ (with pkgs.${namespace}; [ + gehomesdk + magicattr + python-nanokvm + python-roborock + ]); config = { # Includes dependencies for a basic setup diff --git a/packages/homeassistant/ha-mail-and-packages/default.nix b/packages/homeassistant/ha-mail-and-packages/default.nix index d7b85ec..6931c34 100644 --- a/packages/homeassistant/ha-mail-and-packages/default.nix +++ b/packages/homeassistant/ha-mail-and-packages/default.nix @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-w+7cC/jV+6bQM1aEPlO90Z1o9CcjmPvjNDSG9CduFFw="; }; - nativeBuildInputs = with python3Packages; [ + buildInputs = with python3Packages; [ beautifulsoup4 dateparser pillow diff --git a/packages/homeassistant/ha-nanokvm/default.nix b/packages/homeassistant/ha-nanokvm/default.nix index 4fef4e2..e038771 100644 --- a/packages/homeassistant/ha-nanokvm/default.nix +++ b/packages/homeassistant/ha-nanokvm/default.nix @@ -17,10 +17,12 @@ buildHomeAssistantComponent rec { hash = "sha256-S6g9mfPEixqeGQkXVK8PZJ/dnEC5ThKtbELAIAhCANM="; }; - nativeBuildInputs = with pkgs.${namespace}; [ + propogatedBuildInputs = with pkgs.${namespace}; [ python-nanokvm ]; + buildInputs = propogatedBuildInputs; + postPatch = '' substituteInPlace custom_components/nanokvm/manifest.json \ --replace-fail '"nanokvm>=0.0.4"' '"nanokvm"' diff --git a/packages/raspberrypi/linux-rpi/default.nix b/packages/raspberrypi/linux-rpi/default.nix index 34cbb11..4c497b2 100644 --- a/packages/raspberrypi/linux-rpi/default.nix +++ b/packages/raspberrypi/linux-rpi/default.nix @@ -19,7 +19,7 @@ let sources = mkAllSources selected; modDirVersion = selected.variables.modDirVersion; - tag = "stable"; + tag = "stable";#sources.tag; # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this # all of these fail for various reasons diff --git a/systems/x86_64-linux/nuc-nixos/default.nix b/systems/x86_64-linux/nuc-nixos/default.nix index ef761b9..f85b7fd 100644 --- a/systems/x86_64-linux/nuc-nixos/default.nix +++ b/systems/x86_64-linux/nuc-nixos/default.nix @@ -87,13 +87,13 @@ living-room-lights = { id = 1741726347213; alias = "Living Room Light Switch"; - mqttDeviceId = "958ff6b3c9df0db21e418aaf6410b996"; + mqttDeviceId = "c90174f076a500c6fd531ecd7e5e259b"; lightEntityId = "light.living_room_lights"; }; bedroom-lights = { id = 1741726231261; alias = "Bedroom Light Switch"; - mqttDeviceId = "de0f34498214842dcccaa6b08967d6b5"; + mqttDeviceId = "7578af456fc02ac36bf3c4e414ac0bd9"; lightEntityId = "light.bedroom_lights"; }; };