Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 finn.markwitz
|
b3471a308a | ||
|
finn.markwitz
|
bf36f935e8 | ||
|
finn.markwitz
|
7bfbf4de9a | ||
|
finn.markwitz
|
28b23fe9f2 | ||
|
finn.markwitz
|
f5f8e88966 | ||
|
finn.markwitz
|
bf874d962a |
@@ -0,0 +1,189 @@
|
||||
# Alexa Media Player Integration — Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** Package the `alexa_media_player` HACS component declaratively on jupiter's Home Assistant so HA can drive the household Echo devices (TTS/announce, media, sensors).
|
||||
|
||||
**Architecture:** Add one `buildHomeAssistantComponent` entry to `services.home-assistant.customComponents` (same pattern as the existing `ha-sourdough`). The component has real Python deps, so the module's `let` block also defines two supporting derivations built against HA's own interpreter: a new `dictor` package and an `alexapy` version bump. No HACS runtime, no YAML config — the integration is added through the HA UI after the rebuild.
|
||||
|
||||
**Tech Stack:** NixOS, `pkgs.buildHomeAssistantComponent`, `buildPythonPackage`, `fetchFromGitHub`/`fetchFromGitLab`/`fetchPypi`.
|
||||
|
||||
## Global Constraints
|
||||
|
||||
- Target machine: **jupiter** only. All edits live in `modules/environments/home-assistant/default.nix`.
|
||||
- Python dep derivations MUST build against Home Assistant's interpreter set — `pkgs.home-assistant.python3Packages` — the same set `buildHomeAssistantComponent` uses. Do not use top-level `pkgs.python3Packages`.
|
||||
- Manifest requirements are enforced at build time by `manifestCheckPhase` and again by HA at runtime. Every requirement must resolve to an installed dist satisfying its specifier. Exact pins (verbatim from `alexa_media_player` v5.15.7 `manifest.json`):
|
||||
- `alexapy==1.29.25`
|
||||
- `dictor>=0.1.12,<0.2`
|
||||
- `wrapt>=1.14.0` (nixpkgs 1.17.2 — already satisfied)
|
||||
- `packaging>=20.3` (nixpkgs 26.1 — already satisfied)
|
||||
- Pinned artifacts (all three hashes verified to build during planning):
|
||||
|
||||
| Artifact | Fetcher | Ref / version | Hash |
|
||||
| ------------------ | ---------------- | ------------- | ------------------------------------------------- |
|
||||
| alexa_media_player | fetchFromGitHub | `v5.15.7` | `sha256-1rcZVSX1xA1Lc4qSu39MOitVEciZFhoPQy2y5+PpoAI=` |
|
||||
| alexapy | fetchFromGitLab | `v1.29.25` | `sha256-P/hvgqZVaBJF5dbmHrDjQMC+pwV3EEhKyFIS5KmhgD4=` |
|
||||
| dictor | fetchPypi (sdist)| `0.1.12` | `sha256-bbSDda4eU9ye2EToWzj04/v79qTmC+yjd1Fa0URTuRs=` |
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
Single file touched: `modules/environments/home-assistant/default.nix`.
|
||||
- Its `let` block gains `haPython`, `dictor`, and `alexapy` bindings.
|
||||
- Its `services.home-assistant.customComponents` list gains a second entry (`alexa_media`) alongside the existing `sourdough` entry.
|
||||
|
||||
No new files. The two supporting derivations are small and specific to this component, so they live inline in the module's `let` block next to their only consumer (files that change together live together).
|
||||
|
||||
---
|
||||
|
||||
### Task 1: Package `alexa_media_player` with its Python dependencies
|
||||
|
||||
**Files:**
|
||||
- Modify: `modules/environments/home-assistant/default.nix` (the `let` block, currently lines 9-12; and the `customComponents` list, currently lines 29-41)
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: `pkgs.home-assistant.python3Packages` (HA interpreter set), `pkgs.buildHomeAssistantComponent`, `pkgs.fetchFromGitHub`, `pkgs.fetchFromGitLab`.
|
||||
- Produces: a second `customComponents` entry with `domain = "alexa_media"`. No other module consumes these `let` bindings.
|
||||
|
||||
- [ ] **Step 1: Add the supporting derivations to the `let` block**
|
||||
|
||||
Edit the `let` block so it reads exactly:
|
||||
|
||||
```nix
|
||||
let
|
||||
cfg = config.my.profiles.home-assistant;
|
||||
hostName = config.networking.hostName;
|
||||
|
||||
# Python deps for the alexa_media_player custom component (Task: Alexa).
|
||||
# Built against Home Assistant's own interpreter — the same set
|
||||
# buildHomeAssistantComponent uses — so HA's build-time and runtime
|
||||
# manifest-requirement checks are satisfied.
|
||||
haPython = pkgs.home-assistant.python3Packages;
|
||||
|
||||
# dictor is not in nixpkgs; alexa_media_player needs dictor>=0.1.12,<0.2.
|
||||
# Pure-Python, no runtime deps, legacy setup.py.
|
||||
dictor = haPython.buildPythonPackage {
|
||||
pname = "dictor";
|
||||
version = "0.1.12";
|
||||
format = "setuptools";
|
||||
src = haPython.fetchPypi {
|
||||
pname = "dictor";
|
||||
version = "0.1.12";
|
||||
hash = "sha256-bbSDda4eU9ye2EToWzj04/v79qTmC+yjd1Fa0URTuRs=";
|
||||
};
|
||||
build-system = [ haPython.setuptools ];
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "dictor" ];
|
||||
};
|
||||
|
||||
# nixpkgs ships alexapy 1.29.22; the manifest pins ==1.29.25. Patch bump.
|
||||
# nixpkgs fetches alexapy from GitLab (keatontaylor/alexapy), tag v<version>.
|
||||
alexapy = haPython.alexapy.overridePythonAttrs (old: {
|
||||
version = "1.29.25";
|
||||
src = pkgs.fetchFromGitLab {
|
||||
owner = "keatontaylor";
|
||||
repo = "alexapy";
|
||||
tag = "v1.29.25";
|
||||
hash = "sha256-P/hvgqZVaBJF5dbmHrDjQMC+pwV3EEhKyFIS5KmhgD4=";
|
||||
};
|
||||
});
|
||||
in
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Add the `alexa_media` entry to `customComponents`**
|
||||
|
||||
In `services.home-assistant.customComponents`, immediately after the closing `)` of the existing `sourdough` entry (current line 40) and before the list's closing `]` (current line 41), add:
|
||||
|
||||
```nix
|
||||
(pkgs.buildHomeAssistantComponent {
|
||||
owner = "Alandtse";
|
||||
domain = "alexa_media";
|
||||
version = "5.15.7";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Alandtse";
|
||||
repo = "alexa_media_player";
|
||||
rev = "v5.15.7";
|
||||
hash = "sha256-1rcZVSX1xA1Lc4qSu39MOitVEciZFhoPQy2y5+PpoAI=";
|
||||
};
|
||||
# Every manifest requirement must be importable at a satisfying
|
||||
# version or manifestCheckPhase fails the build.
|
||||
dependencies = [
|
||||
alexapy
|
||||
dictor
|
||||
haPython.wrapt
|
||||
haPython.packaging
|
||||
];
|
||||
})
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Format the file**
|
||||
|
||||
Run: `nixfmt-rfc-style modules/environments/home-assistant/default.nix`
|
||||
Expected: exits 0, no diff surprises (re-read the file if unsure).
|
||||
|
||||
- [ ] **Step 4: Build the component in isolation first (fast feedback)**
|
||||
|
||||
This is the real test: it runs `manifestCheckPhase`, which fails loudly if any of the four requirements is unmet. It was verified to succeed during planning.
|
||||
|
||||
Run:
|
||||
```bash
|
||||
nix build --impure --no-link --print-out-paths --expr '
|
||||
let
|
||||
pkgs = (builtins.getFlake (toString ./.)).nixosConfigurations.jupiter.pkgs;
|
||||
py = pkgs.home-assistant.python3Packages;
|
||||
dictor = py.buildPythonPackage {
|
||||
pname = "dictor"; version = "0.1.12"; format = "setuptools";
|
||||
src = py.fetchPypi { pname = "dictor"; version = "0.1.12"; hash = "sha256-bbSDda4eU9ye2EToWzj04/v79qTmC+yjd1Fa0URTuRs="; };
|
||||
build-system = [ py.setuptools ]; doCheck = false; pythonImportsCheck = [ "dictor" ];
|
||||
};
|
||||
alexapy = py.alexapy.overridePythonAttrs (old: {
|
||||
version = "1.29.25";
|
||||
src = pkgs.fetchFromGitLab { owner = "keatontaylor"; repo = "alexapy"; tag = "v1.29.25"; hash = "sha256-P/hvgqZVaBJF5dbmHrDjQMC+pwV3EEhKyFIS5KmhgD4="; };
|
||||
});
|
||||
in pkgs.buildHomeAssistantComponent {
|
||||
owner = "Alandtse"; domain = "alexa_media"; version = "5.15.7";
|
||||
src = pkgs.fetchFromGitHub { owner = "Alandtse"; repo = "alexa_media_player"; rev = "v5.15.7"; hash = "sha256-1rcZVSX1xA1Lc4qSu39MOitVEciZFhoPQy2y5+PpoAI="; };
|
||||
dependencies = [ alexapy dictor py.wrapt py.packaging ];
|
||||
}'
|
||||
```
|
||||
Expected: prints a `/nix/store/...-Alandtse-alexa_media-5.15.7` path, exit 0. If it fails with `<pkg><specifier> not satisfied by version ...`, a dependency version drifted — re-check the manifest pin against the provided dep.
|
||||
|
||||
- [ ] **Step 5: Build the whole jupiter system (integration gate)**
|
||||
|
||||
Run: `nix build '.#nixosConfigurations.jupiter.config.system.build.toplevel'`
|
||||
Expected: builds to completion, exit 0. This confirms the module edits evaluate and the component is wired into HA's package.
|
||||
|
||||
- [ ] **Step 6: Commit**
|
||||
|
||||
```bash
|
||||
git add modules/environments/home-assistant/default.nix
|
||||
git commit -m "$(cat <<'EOF'
|
||||
feat(home-assistant): add alexa_media_player custom component
|
||||
|
||||
Package the Alexa Media Player HACS component declaratively (v5.15.7),
|
||||
so HA can drive the Echo devices (TTS/announce, media, sensors). Needs
|
||||
dictor 0.1.12 (absent from nixpkgs) and an alexapy 1.29.22 -> 1.29.25
|
||||
bump to satisfy the manifest's exact requirement pins; both build
|
||||
against HA's interpreter. Config-flow based: add via the HA UI and sign
|
||||
in with the Amazon account after rebuild.
|
||||
|
||||
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Post-implementation (manual, by the user — not an automatable step)
|
||||
|
||||
After `sudo nixos-rebuild switch --flake '.#jupiter'`:
|
||||
1. Settings → Devices & Services → Add Integration → **Alexa Media Player**.
|
||||
2. Sign in with the Amazon account; complete any 2FA / app-password prompt in the UI flow.
|
||||
3. Confirm media_player entities and sensors appear; test a TTS/announce service call to an Echo.
|
||||
|
||||
## Self-Review
|
||||
|
||||
- **Spec coverage:** goal (alexa_media_player packaging) → Task 1; alexapy bump → Step 1; dictor packaging → Step 1; component entry → Step 2; wrapt/packaging already-satisfied → included as deps in Step 2; build-time manifest check → Steps 4-5; runtime config-flow → Post-implementation. Deferred Alexa→HA scope: intentionally absent. No gaps.
|
||||
- **Placeholder scan:** none — every step has concrete code/commands and the verified hashes.
|
||||
- **Type/name consistency:** `haPython`, `dictor`, `alexapy` defined in Step 1 and referenced by those exact names in Step 2; domain `alexa_media` consistent throughout; hashes identical across plan, spec, and the verified build.
|
||||
@@ -1,61 +0,0 @@
|
||||
# mibook: choose terminal-only vs desktop at boot
|
||||
|
||||
## Goal
|
||||
|
||||
Let mibook boot to a text console by default, with KDE fully installed and
|
||||
launchable on demand. The user decides after boot whether they need the
|
||||
graphical desktop, without rebuilding the system.
|
||||
|
||||
## Behavior
|
||||
|
||||
- mibook boots to a text console (`multi-user.target`). SDDM and Plasma do
|
||||
**not** start automatically.
|
||||
- KDE (SDDM + Plasma 6) remains fully installed.
|
||||
- Running `desktop` in the terminal starts the SDDM display manager, which
|
||||
presents the graphical login screen; logging in there enters a Plasma 6
|
||||
session.
|
||||
- No reverse command. To return to a text console, stop the display manager
|
||||
(`sudo systemctl stop display-manager`) or reboot.
|
||||
- Other machines that enable the `kde-desktop` profile are unaffected; their
|
||||
desktop still starts on boot.
|
||||
|
||||
## Implementation
|
||||
|
||||
### `modules/environments/kde-desktop/default.nix`
|
||||
|
||||
Add an opt-out option to the existing profile:
|
||||
|
||||
- New option `my.profiles.kde-desktop.startOnBoot`, a boolean defaulting to
|
||||
`true`. The default preserves the current behavior for every consumer.
|
||||
- The existing `config` block (SDDM, Plasma 6, user packages) stays enabled
|
||||
whenever the profile is enabled, regardless of `startOnBoot`.
|
||||
- When `startOnBoot = false`, additionally apply:
|
||||
- `systemd.services.display-manager.wantedBy = lib.mkForce [ ];` so SDDM is
|
||||
defined but not pulled in by any boot target.
|
||||
- `systemd.defaultUnit = "multi-user.target";` so the boot target is the
|
||||
text console.
|
||||
- A `desktop` command provided via
|
||||
`pkgs.writeShellScriptBin "desktop" "exec sudo systemctl start display-manager.service"`,
|
||||
added to `environment.systemPackages`.
|
||||
|
||||
### `machines/mibook/environments.nix`
|
||||
|
||||
Set `kde-desktop.startOnBoot = false;` alongside the existing
|
||||
`kde-desktop.enable = true;`.
|
||||
|
||||
## Testing / verification
|
||||
|
||||
- `nix build '.#nixosConfigurations.mibook.config.system.build.toplevel'`
|
||||
builds without error.
|
||||
- After `nixos-rebuild switch` on mibook: system boots to a TTY, no SDDM;
|
||||
running `desktop` brings up the SDDM login and a working Plasma session.
|
||||
- Confirm jupiter (or any non-mibook consumer) is unchanged: its evaluated
|
||||
`systemd.defaultUnit` / display-manager wantedBy are not altered.
|
||||
|
||||
## Trade-offs
|
||||
|
||||
- `desktop` relies on `sudo`; the user has sudo access, so no extra
|
||||
configuration is required.
|
||||
- Chose "boot to terminal, launch on demand" over a GRUB boot-menu entry
|
||||
because it is more robust across NixOS generations and needs no fragile
|
||||
static kernel entries.
|
||||
@@ -0,0 +1,152 @@
|
||||
# Amazon Alexa integration for Home Assistant (jupiter) — design
|
||||
|
||||
**Date:** 2026-07-29
|
||||
**Machine:** jupiter
|
||||
**Status:** approved, ready for implementation plan
|
||||
|
||||
## Goal
|
||||
|
||||
Let Home Assistant control and read the household Amazon Echo devices via the
|
||||
unofficial [`alexa_media_player`](https://github.com/Alandtse/alexa_media_player)
|
||||
integration: text-to-speech / announcements, media control, and per-device
|
||||
sensors (last-called device, next alarm/timer, DND state, etc.).
|
||||
|
||||
This uses the user's Amazon account through an unofficial API. It is a
|
||||
config-flow integration: after the rebuild it is added through the HA UI, not
|
||||
via YAML.
|
||||
|
||||
## Non-goals (deferred)
|
||||
|
||||
Alexa → HA voice control ("Alexa, turn on the light") is **out of scope**. It
|
||||
would need either `emulated_hue` bound to port 80 on the LAN, or a public HTTPS
|
||||
endpoint plus the AWS-Lambda Smart Home Skill. The user chose to decide on that
|
||||
later. Nothing in this change touches the firewall, port 80, systemd unit
|
||||
capabilities, or network exposure.
|
||||
|
||||
## Approach
|
||||
|
||||
Package the integration declaratively, following the existing `ha-sourdough`
|
||||
pattern in `modules/environments/home-assistant/default.nix` (a
|
||||
`buildHomeAssistantComponent` entry in `services.home-assistant.customComponents`).
|
||||
No HACS runtime.
|
||||
|
||||
Unlike sourdough, `alexa_media_player` has real Python dependencies. Its
|
||||
`manifest.json` (v5.15.7) declares:
|
||||
|
||||
```
|
||||
alexapy==1.29.25
|
||||
packaging>=20.3
|
||||
wrapt>=1.14.0
|
||||
dictor>=0.1.12,<0.2
|
||||
```
|
||||
|
||||
`buildHomeAssistantComponent` runs `manifestCheckPhase` at build time
|
||||
(`check_manifest.py`): every requirement must resolve to an installed
|
||||
distribution **whose version satisfies the specifier**, or the build fails.
|
||||
Home Assistant repeats this check at runtime. Therefore each requirement must be
|
||||
satisfied exactly — the exact `==1.29.25` pin in particular.
|
||||
|
||||
Dependency status in the pinned nixpkgs (`nixos-25.11`):
|
||||
|
||||
| Requirement | nixpkgs today | Action |
|
||||
| ---------------------- | ------------- | --------------------------------------- |
|
||||
| `alexapy==1.29.25` | 1.29.22 | **Bump** to 1.29.25 via override |
|
||||
| `dictor>=0.1.12,<0.2` | *absent* | **Package** dictor 0.1.12 (new) |
|
||||
| `wrapt>=1.14.0` | 1.17.2 | none — already satisfied |
|
||||
| `packaging>=20.3` | 26.1 | none — already satisfied |
|
||||
|
||||
`authcaptureproxy` (in nixpkgs at 1.3.7) is a transitive dependency of
|
||||
`alexapy`, not listed in the manifest, so it needs no direct handling.
|
||||
|
||||
## Components
|
||||
|
||||
All changes live in `modules/environments/home-assistant/default.nix` (plus the
|
||||
hashes below). Three small pieces, wired together in the module's `let` block:
|
||||
|
||||
### 1. `dictor` package (new)
|
||||
|
||||
Not in nixpkgs. Pure-Python, no runtime dependencies (`requires_dist: null`),
|
||||
ships a `setup.py`. A minimal `pkgs.python3Packages.buildPythonPackage`:
|
||||
|
||||
- pname `dictor`, version `0.1.12`
|
||||
- `src = fetchPypi { pname = "dictor"; version = "0.1.12"; hash = "sha256-bbSDda4eU9ye2EToWzj04/v79qTmC+yjd1Fa0URTuRs="; }`
|
||||
- setuptools format (legacy `setup.py`); `build-system = [ setuptools ]`
|
||||
- `doCheck = false` (no meaningful test suite); `pythonImportsCheck = [ "dictor" ]`
|
||||
|
||||
Build against the HA Python set so the version lands in HA's venv — i.e. use
|
||||
`config.services.home-assistant.package.python.pkgs` (the same interpreter the
|
||||
component check and HA runtime use), not the top-level `pkgs.python3Packages`.
|
||||
|
||||
### 2. `alexapy` 1.29.25 (override)
|
||||
|
||||
nixpkgs `alexapy` is fetched from **GitLab** (`keatontaylor/alexapy`, tag
|
||||
`v<version>`), not PyPI. Override just the version + src via
|
||||
`overridePythonAttrs`, reusing the existing build-system and dependency list:
|
||||
|
||||
- `version = "1.29.25"`
|
||||
- `src = fetchFromGitLab { owner = "keatontaylor"; repo = "alexapy"; tag = "v1.29.25"; hash = "sha256-P/hvgqZVaBJF5dbmHrDjQMC+pwV3EEhKyFIS5KmhgD4="; }`
|
||||
|
||||
This is a patch bump (1.29.22 → 1.29.25); the dependency set is expected to be
|
||||
unchanged. Override the HA-Python-set `alexapy` so it shares the interpreter
|
||||
with dictor and the component.
|
||||
|
||||
### 3. `alexa_media_player` component (new `customComponents` entry)
|
||||
|
||||
```
|
||||
buildHomeAssistantComponent {
|
||||
owner = "Alandtse";
|
||||
domain = "alexa_media";
|
||||
version = "5.15.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alandtse";
|
||||
repo = "alexa_media_player";
|
||||
rev = "v5.15.7";
|
||||
hash = "sha256-1rcZVSX1xA1Lc4qSu39MOitVEciZFhoPQy2y5+PpoAI=";
|
||||
};
|
||||
dependencies = [ alexapy' dictor' wrapt packaging ]; # HA-python-set packages
|
||||
}
|
||||
```
|
||||
|
||||
`dependencies` must make every manifest requirement importable at the required
|
||||
version for `manifestCheckPhase` to pass. Include all four (the two custom ones
|
||||
plus `wrapt` and `packaging` from the HA Python set) to be explicit.
|
||||
|
||||
## Data flow
|
||||
|
||||
1. `nixos-rebuild switch` builds the component; `manifestCheckPhase` validates
|
||||
the four requirements against the provided `dependencies`.
|
||||
2. HA starts; the custom component is present but not configured.
|
||||
3. User adds **Alexa Media Player** in Settings → Devices & Services, signs in
|
||||
with the Amazon account (email/password; 2FA or app-password handled in the
|
||||
UI flow at runtime).
|
||||
4. HA creates media_player entities and per-device sensors; TTS/announce
|
||||
services become available for automations.
|
||||
|
||||
## Error handling / risks
|
||||
|
||||
- **Version-pin drift.** If a future `alexa_media_player` bump changes the
|
||||
`alexapy==` pin, `alexapy` must be re-bumped in lockstep, or the build fails
|
||||
loudly at `manifestCheckPhase` (fail-safe, not silent).
|
||||
- **Amazon login fragility.** The unofficial API can break on Amazon's side
|
||||
(captcha/2FA changes). This is a runtime concern, independent of packaging;
|
||||
not addressed here.
|
||||
- **`dictor` upper bound `<0.2`.** 0.1.12 is the current release and satisfies
|
||||
it. If nixpkgs later gains a `dictor` ≥ 0.2, prefer our pinned 0.1.12 for
|
||||
this component.
|
||||
|
||||
## Verification
|
||||
|
||||
- `nix build '.#nixosConfigurations.jupiter.config.system.build.toplevel'`
|
||||
succeeds — this exercises the build-time manifest-requirements check for all
|
||||
three new/overridden derivations.
|
||||
- `nixfmt-rfc-style` clean on the edited module.
|
||||
- Post-deploy (manual, by the user): the integration appears under Add
|
||||
Integration, and a TTS/announce call reaches an Echo.
|
||||
|
||||
## Pinned artifacts
|
||||
|
||||
| Artifact | Source | Ref / version | Hash |
|
||||
| --------------------------- | ---------- | ------------- | ------------------------------------------------- |
|
||||
| alexa_media_player | GitHub | v5.15.7 | sha256-1rcZVSX1xA1Lc4qSu39MOitVEciZFhoPQy2y5+PpoAI= |
|
||||
| alexapy | GitLab | v1.29.25 | sha256-P/hvgqZVaBJF5dbmHrDjQMC+pwV3EEhKyFIS5KmhgD4= |
|
||||
| dictor | PyPI sdist | 0.1.12 | sha256-bbSDda4eU9ye2EToWzj04/v79qTmC+yjd1Fa0URTuRs= |
|
||||
@@ -6,7 +6,6 @@ in
|
||||
{
|
||||
my.profiles = {
|
||||
kde-desktop.enable = true;
|
||||
kde-desktop.startOnBoot = false;
|
||||
zsh.enable = true;
|
||||
apps = {
|
||||
desktop_apps = true;
|
||||
|
||||
@@ -9,6 +9,39 @@
|
||||
let
|
||||
cfg = config.my.profiles.home-assistant;
|
||||
hostName = config.networking.hostName;
|
||||
|
||||
# Python deps for the alexa_media_player custom component. Built against
|
||||
# Home Assistant's own interpreter — the same set buildHomeAssistantComponent
|
||||
# uses — so HA's build-time and runtime manifest-requirement checks pass.
|
||||
haPython = pkgs.home-assistant.python3Packages;
|
||||
|
||||
# dictor is not in nixpkgs; alexa_media_player needs dictor>=0.1.12,<0.2.
|
||||
# Pure-Python, no runtime deps, legacy setup.py.
|
||||
dictor = haPython.buildPythonPackage {
|
||||
pname = "dictor";
|
||||
version = "0.1.12";
|
||||
format = "setuptools";
|
||||
src = haPython.fetchPypi {
|
||||
pname = "dictor";
|
||||
version = "0.1.12";
|
||||
hash = "sha256-bbSDda4eU9ye2EToWzj04/v79qTmC+yjd1Fa0URTuRs=";
|
||||
};
|
||||
build-system = [ haPython.setuptools ];
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "dictor" ];
|
||||
};
|
||||
|
||||
# nixpkgs ships alexapy 1.29.22; the manifest pins ==1.29.25. Patch bump.
|
||||
# nixpkgs fetches alexapy from GitLab (keatontaylor/alexapy), tag v<version>.
|
||||
alexapy = haPython.alexapy.overridePythonAttrs (old: {
|
||||
version = "1.29.25";
|
||||
src = pkgs.fetchFromGitLab {
|
||||
owner = "keatontaylor";
|
||||
repo = "alexapy";
|
||||
tag = "v1.29.25";
|
||||
hash = "sha256-P/hvgqZVaBJF5dbmHrDjQMC+pwV3EEhKyFIS5KmhgD4=";
|
||||
};
|
||||
});
|
||||
in
|
||||
{
|
||||
|
||||
@@ -23,6 +56,42 @@ in
|
||||
services.home-assistant = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
|
||||
# HACS-style custom components, packaged declaratively (no HACS runtime).
|
||||
# Config-flow based: add via Settings > Devices & Services after rebuild.
|
||||
customComponents = [
|
||||
(pkgs.buildHomeAssistantComponent {
|
||||
owner = "Matts-Baps";
|
||||
domain = "sourdough";
|
||||
version = "1.1.3";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Matts-Baps";
|
||||
repo = "ha-sourdough";
|
||||
rev = "v1.1.3";
|
||||
hash = "sha256-Uoid/2f6GxZMuE5Keu2VjHPYuOxnYG8hsCD6BYcaTvM=";
|
||||
};
|
||||
})
|
||||
(pkgs.buildHomeAssistantComponent {
|
||||
owner = "Alandtse";
|
||||
domain = "alexa_media";
|
||||
version = "5.15.7";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Alandtse";
|
||||
repo = "alexa_media_player";
|
||||
rev = "v5.15.7";
|
||||
hash = "sha256-1rcZVSX1xA1Lc4qSu39MOitVEciZFhoPQy2y5+PpoAI=";
|
||||
};
|
||||
# Every manifest requirement must be importable at a satisfying
|
||||
# version or manifestCheckPhase fails the build.
|
||||
dependencies = [
|
||||
alexapy
|
||||
dictor
|
||||
haPython.wrapt
|
||||
haPython.packaging
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
extraComponents = [
|
||||
"matter"
|
||||
"mobile_app"
|
||||
|
||||
@@ -11,19 +11,9 @@ in
|
||||
{
|
||||
options.my.profiles.kde-desktop = with lib; {
|
||||
enable = mkEnableOption "KDE Desktop Environment";
|
||||
startOnBoot = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Whether the display manager (SDDM) starts automatically at boot.
|
||||
When false, the system boots to a text console and KDE can be
|
||||
launched on demand with the `desktop` command.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable (lib.mkMerge [
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
services = {
|
||||
displayManager.sddm.enable = true;
|
||||
displayManager.sddm.wayland.enable = true;
|
||||
@@ -33,15 +23,5 @@ in
|
||||
# Programms can be added here...
|
||||
numix-icon-theme
|
||||
];
|
||||
}
|
||||
(lib.mkIf (!cfg.startOnBoot) {
|
||||
# Boot to a text console; SDDM stays installed but is not pulled in
|
||||
# by any boot target. Launch KDE on demand with `desktop`.
|
||||
systemd.services.display-manager.wantedBy = lib.mkForce [ ];
|
||||
systemd.defaultUnit = lib.mkForce "multi-user.target";
|
||||
environment.systemPackages = [
|
||||
(pkgs.writeShellScriptBin "desktop" "exec sudo systemctl start display-manager.service")
|
||||
];
|
||||
})
|
||||
]);
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user