Add floorplan config

hosts/odyssey/default.nix

@@ -1,7 +1,5 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
-let streamrip = pkgs.callPackage ../../pkgs/streamrip/package.nix { };
-in
 {
   imports = [
     ./hardware-configuration.nix
@@ -51,10 +49,6 @@ in
     };
   };
 
-  environment.systemPackages = [
-    streamrip
-  ];
-
   modules = {
     desktop = {
       apps.qbittorrent.enable = true;

hosts/pi/default.nix

@@ -108,111 +108,6 @@
     pulse.enable = true;
   };
 
-  age.secrets."files/services/home-assistant/secrets.yaml" = {
-    file = "${self.inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
-    path = "${config.services.home-assistant.configDir}/secrets.yaml";
-    owner = "hass";
-    group = "hass";
-  };
-
-  services.home-assistant = {
-    enable = true;
-    extraComponents = [
-      "api"
-      "alert"
-      "auth"
-      "backup"
-      "command_line"
-      "default_config"
-      "homekit_controller"
-      "homekit"
-      "http"
-      "icloud"
-      "jellyfin"
-      "metoffice"
-      "mqtt"
-      "onkyo"
-      "ping"
-      "proximity"
-      "radio_browser"
-      "scrape"
-      "sensor"
-      "system_health"
-    ];
-    config = {
-      default_config = {};
-      backup = {};
-      homeassistant = {
-        name = "Home";
-        latitude = "!secret latitude";
-        longitude = "!secret longitude";
-        country = "GB";
-        temperature_unit = "C";
-        time_zone = config.time.timeZone;
-        unit_system = "metric";
-      };
-      mqtt = { };
-      scene = "!include scenes.yaml";
-      automation = "!include automations.yaml";
-      system_health = { };
-      recorder = {
-        purge_keep_days = 365;
-      };
-    };
-  };
-
-  services.mosquitto = {
-    enable = true;
-    listeners = [{
-      acl = [ "pattern readwrite #" ];
-      omitPasswordAuth = true;
-      port = 1883;
-      settings = {
-        allow_anonymous = true;
-      };
-    }];
-  };
-
-  age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
-    file = "${self.inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
-    path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
-    owner = "zigbee2mqtt";
-    group = "zigbee2mqtt";
-  };
-
-  services.zigbee2mqtt = {
-    package = pkgs.unstable.zigbee2mqtt;
-    enable = true;
-    dataDir = "/var/lib/zigbee2mqtt";
-    settings = {
-      homeassistant = lib.optionalAttrs config.services.home-assistant.enable {
-        discovery_topic = "homeassistant";
-        status_topic = "hass/status";
-        legacy_entity_attributes = true;
-        legacy_triggers = true;
-      };
-      availability = true;
-      frontend = true;
-      device_options = {
-        retain = true;
-      };
-      serial = {
-        port = "/dev/serial/by-id/usb-Silicon_Labs_Sonoff_Zigbee_3.0_USB_Dongle_Plus_0001-if00-port0";
-      };
-      advanced = {
-        channel = 20;
-        network_key = "!secret.yaml network_key";
-        pan_id = 13001;
-        ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
-        transmit_power = 20;
-      };
-      mqtt = {
-        version = 5;
-        server = "mqtt://localhost:1883";
-      };
-    };
-  };
-
   modules = {
     networking = {
       wireless = {
@@ -223,12 +118,9 @@
     services = {
       borgmatic = {
         enable = true;
-        directories = [
-          "/var/lib/mosquitto"
-          "/var/lib/zigbee2mqtt"
-        ];
         repoPath = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo";
       };
+      home-assistant.enable = true;
     };
   };
 

hosts/pi/hardware-configuration.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ lib, pkgs, modulesPath, ... }:
 
 {
   imports = [
@@ -7,9 +7,9 @@
 
   boot = {
     kernelPackages = let
-      version = "6.6.51";
+      version = "6.1.73";
-      tag = "stable_20241008";
+      tag = "stable_20240124";
-      srcHash = "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U=";
+      srcHash = "sha256-P4ExzxWqZj+9FZr9U2tmh7rfs/3+iHEv0m74PCoXVuM=";
       in pkgs.linuxPackagesFor (pkgs.linux_rpi4.override {
         argsOverride = {
           src = pkgs.fetchFromGitHub {
@@ -21,7 +21,22 @@
           version = version;
           modDirVersion = version;
           structuredExtraConfig = {};
-          kernelPatches = [];
+          kernelPatches = [
+            {
+              name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch";
+              patch = pkgs.fetchpatch {
+                url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch";
+                hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw=";
+              };
+            }
+            {
+              name = "iommu-bcm2712-don-t-allow-building-as-module.patch";
+              patch = pkgs.fetchpatch {
+                url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch";
+                hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A=";
+              };
+            }
+          ];
         };
       });
 
@@ -39,9 +54,9 @@
     })
     (final: prev: {
       raspberrypifw = let
-        version = "1.20241008";
+        version = "1.20240529";
-        srcHash = "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=";
+        srcHash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
-        in pkgs.blah.override {
+        in pkgs.raspberrypifw.override {
           argsOverride = {
             src = prev.fetchFromGitHub {
               owner = "raspberrypi";

modules/default.nix

@@ -43,6 +43,7 @@
     ./services/gitea
     ./services/gitea-runner
     ./services/headscale
+    ./services/home-assistant
     ./services/mail
     ./services/matrix
     ./services/nginx

modules/options.nix

@@ -36,7 +36,7 @@ with lib;
       in {
         inherit name;
         isNormalUser = true;
-        extraGroups = [ "networkmanager" "wheel" "lxd" ];
+        extraGroups = [ "audio" "networkmanager" "wheel" "lxd" ];
         description = "Jordan Holt";
         useDefaultShell = true;
         openssh.authorizedKeys.keys = [

modules/services/home-assistant/default.nix

@@ -0,0 +1,298 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  cfg = config.modules.services.home-assistant;
+in {
+  imports = [
+    ./floorplan/default.nix
+    ./mqtt.nix
+  ];
+
+  options.modules.services.home-assistant.enable = lib.mkEnableOption "home-assistant";
+
+  config = lib.mkIf cfg.enable {
+
+    age.secrets."files/services/home-assistant/secrets.yaml" = {
+      file = "${self.inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
+      path = "${config.services.home-assistant.configDir}/secrets.yaml";
+      owner = "hass";
+      group = "hass";
+    };
+
+    services.home-assistant = {
+      enable = true;
+
+      config = {
+        automation = "!include automations.yaml";
+        backup = { };
+        binary_sensor = [ ];
+        default_config = { };
+        http = {
+          server_host = "::1";
+          trusted_proxies = [ "::1" ];
+          use_x_forwarded_for = true;
+        };
+        ffmpeg = { };
+        homeassistant = {
+          name = "Home";
+          latitude = "!secret latitude";
+          longitude = "!secret longitude";
+          country = "GB";
+          temperature_unit = "C";
+          time_zone = config.time.timeZone;
+          unit_system = "metric";
+          auth_providers = [
+            {
+              type = "trusted_networks";
+              trusted_networks = [
+                "100.64.0.0/10"
+                "127.0.0.1"
+              ];
+              allow_bypass_login = true;
+            }
+            {
+              type = "homeassistant";
+            }
+          ];
+        };
+        logger = {
+          default = "info";
+          logs = { };
+        };
+        lovelace = {
+          resources = [
+            {
+              url = "/local/nixos-lovelace-modulels/mushroom.js";
+              type = "module";
+            }
+          ];
+        };
+        media_player = [ ];
+        mobile_app = { };
+        onkyo = { };
+        open_meteo = { };
+        recorder = {
+          purge_keep_days = 365;
+        };
+        scene = "!include scenes.yaml";
+        script = "!include scripts.yaml";
+        sensor = [ ];
+        system_health = { };
+        zeroconf = { };
+      };
+
+      configDir = "/etc/home-assistant";
+
+      extraComponents = [
+        "air_quality"
+        "airly"
+        "alert"
+        "api"
+        "application_credentials"
+        "asuswrt"
+        "auth"
+        "automation"
+        "bayesian"
+        "binary_sensor"
+        # "blackbird"
+        "blueprint"
+        "bluetooth_adapters"
+        "bluetooth_le_tracker"
+        "button"
+        "calendar"
+        "camera"
+        "cast"
+        "cert_expiry"
+        "climate"
+        "co2signal"
+        "color_extractor"
+        "command_line"
+        "compensation"
+        "configurator"
+        "counter"
+        "cover"
+        "cpuspeed"
+        "default_config"
+        "demo"
+        "derivative"
+        "device_automation"
+        "device_sun_light_trigger"
+        "device_tracker"
+        "dlna_dmr"
+        "dlna_dms"
+        "dnsip"
+        "esphome"
+        "fail2ban"
+        "fan"
+        "feedreader"
+        "ffmpeg"
+        "file"
+        "file_upload"
+        "filesize"
+        "folder"
+        "folder_watcher"
+        "forecast_solar"
+        "frontend"
+        "gdacs"
+        "generic"
+        "generic_hygrostat"
+        "generic_thermostat"
+        "geo_json_events"
+        "geo_location"
+        "geo_rss_events"
+        "github"
+        "group"
+        "hardware"
+        "hdmi_cec"
+        "history_stats"
+        "homeassistant"
+        "homekit"
+        "homekit_controller"
+        "html5"
+        "http"
+        "humidifier"
+        "icloud"
+        "image_processing"
+        "input_boolean"
+        "input_button"
+        "input_datetime"
+        "input_number"
+        "input_select"
+        "input_text"
+        "integration"
+        "ios"
+        "jellyfin"
+        "light"
+        "local_calendar"
+        "local_file"
+        "local_ip"
+        "local_todo"
+        "lock"
+        "logentries"
+        "logger"
+        "lovelace"
+        "manual"
+        "manual_mqtt"
+        "matter"
+        "media_player"
+        "min_max"
+        "mjpeg"
+        "modern_forms"
+        "mold_indicator"
+        "moon"
+        "mysensors"
+        "network"
+        "nmap_tracker"
+        "notify"
+        "number"
+        "onboarding"
+        "onkyo"
+        "panel_custom"
+        "persistent_notification"
+        "person"
+        "ping"
+        "plant"
+        "prometheus"
+        "proximity"
+        "push"
+        "proximity"
+        "python_script"
+        "radio_browser"
+        "random"
+        "recorder"
+        "remote"
+        "repairs"
+        "rest"
+        "rest_command"
+        "rss_feed_template"
+        "scene"
+        "schedule"
+        "scrape"
+        "script"
+        "search"
+        "season"
+        "select"
+        "sense"
+        "sensor"
+        "sensorpush"
+        "shell_command"
+        "shopping_list"
+        "siren"
+        "smtp"
+        "snmp"
+        "sql"
+        "statistics"
+        "sun"
+        "switch"
+        "switch_as_x"
+        "system_health"
+        "system_log"
+        "systemmonitor"
+        "tag"
+        "tailscale"
+        "tcp"
+        "template"
+        "text"
+        "thread"
+        "threshold"
+        "time_date"
+        "timer"
+        "tod"
+        "todo"
+        "tomorrowio"
+        "trend"
+        "universal"
+        "upb"
+        "update"
+        "upnp"
+        "uptime"
+        "utility_meter"
+        "vacuum"
+        "vlc"
+        "vlc_telnet"
+        "wake_on_lan"
+        "water_heater"
+        "weather"
+        "websocket_api"
+        "wled"
+        "workday"
+        "worldclock"
+        "zone"
+      ];
+
+      extraPackages = python3Packages: with python3Packages; [
+        onkyo-eiscp
+        zeroconf
+      ];
+
+      customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
+        bubble-card
+        button-card
+        mushroom
+        sankey-chart
+        universal-remote-card
+        # zigbee2mqtt-networkmap
+      ];
+    };
+
+    systemd.services.home-assistant.preStart = lib.mkForce "";
+
+    modules.services.borgmatic.directories = [
+      config.services.home-assistant.configDir
+    ];
+
+    services.nginx = {
+      enable = true;
+      virtualHosts."home.mesh.vimium.net" = {
+        forceSSL = false;
+        extraConfig = ''
+          proxy_buffering off;
+        '';
+        locations."/" = {
+          proxyPass = "http://[::1]:8123";
+          proxyWebsockets = true;
+        };
+      };
+    };
+  };
+}

modules/services/home-assistant/floorplan/default.nix

@@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }: 
+
+let
+  cfg = config.modules.services.home-assistant;
+in {
+  config = lib.mkIf cfg.enable {
+    services.home-assistant = {
+      config.lovelace.resources = [{
+        url = "/local/nixos-lovelace-modules/floorplan.js";
+        type = "module";
+      }];
+      customLovelaceModules = [
+        pkgs.ha-floorplan
+      ];
+    };
+
+    environment.etc."home-assistant/www/floorplan/style.css".source = ./style.css;
+    environment.etc."home-assistant/www/floorplan/config.yaml".text = builtins.toJSON {
+      image = {
+        location = "/local/floorplan/beetham.svg";
+        cache = false;
+      };
+      stylesheet = {
+        location = "/local/floorplan/style.css";
+        cache = false;
+      };
+
+      defaults = {
+        hover_action = "hover-info";
+        hold_action = "toggle";
+        tap_action = "more-info";
+      };
+
+      rules = [
+        {
+          name = "Rooms";
+          entities = [
+            {
+              entity = "light.bedroom_lamps";
+              element = "area.bedroom";
+            }
+            {
+              entity = "light.hallway_spots";
+              element = "area.hallway";
+            }
+            {
+              entity = "light.living_room_lamps";
+              element = "area.livingroom";
+            }
+            {
+              entity = "light.office_lamps";
+              element = "area.office";
+            }
+          ];
+          tap_action = "light.toggle";
+          state_action = {
+            service = "floorplan.class_set";
+            service_data = ''
+              if (entity.state === "on") {
+                return "light-on";
+              }
+              return "light-off";
+            '';
+          };
+        }
+        {
+          name = "Temperature";
+          entities = [
+            "sensor.motion_sensor_temperature"
+          ];
+          state_action = [
+            {
+              service = "floorplan.text_set";
+              service_data = ''
+                if (!isNaN(entity.state)) {
+                  return Math.round(entity.state * 10) / 10 + "°";
+                }
+                return "Unknown";
+              '';
+            }
+            {
+              service = "floorplan.class_set";
+              service_data = {
+                class = "static-temp";
+              };
+            }
+          ];
+        }
+      ];
+    };
+  };
+}

modules/services/home-assistant/floorplan/style.css

@@ -0,0 +1,27 @@
+#floorplan {
+  padding: 10px;
+}
+
+svg, svg * {
+  vector-effect: non-scaling-stroke !important;
+  pointer-events: all !important;
+}
+
+path[id*="area."].light-on {
+  opacity: 0 !important;
+}
+
+path[id*="area."] {
+  opacity: 0.5 !important;
+  transition: opacity .25s;
+  -moz-transition: opacity .25s;
+  -webkit-transition: opacity .25s;
+}
+
+svg tspan {
+  fill: var(--primary-text-color);
+}
+
+.static-temp, .static-temp tspan {
+  fill: #ffffff;
+}

modules/services/home-assistant/mqtt.nix

@@ -0,0 +1,75 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  cfg = config.modules.services.home-assistant;
+in {
+  config = lib.mkIf cfg.enable {
+    services.mosquitto = {
+      enable = true;
+      listeners = [{
+        acl = [ "pattern readwrite #" ];
+        omitPasswordAuth = true;
+        port = 1883;
+        settings = {
+          allow_anonymous = true;
+        };
+      }];
+    };
+
+    age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
+      file = "${self.inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
+      path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
+      owner = "zigbee2mqtt";
+      group = "zigbee2mqtt";
+    };
+
+    services.zigbee2mqtt = {
+      package = pkgs.unstable.zigbee2mqtt;
+      enable = true;
+      dataDir = "/var/lib/zigbee2mqtt";
+      settings = {
+        homeassistant = lib.optionalAttrs config.services.home-assistant.enable {
+          discovery_topic = "homeassistant";
+          status_topic = "hass/status";
+          legacy_entity_attributes = true;
+          legacy_triggers = true;
+        };
+        availability = true;
+        frontend = true;
+        device_options = {
+          retain = true;
+        };
+        serial = {
+          port = "/dev/serial/by-id/usb-Silicon_Labs_Sonoff_Zigbee_3.0_USB_Dongle_Plus_0001-if00-port0";
+        };
+        advanced = {
+          channel = 20;
+          network_key = "!secret.yaml network_key";
+          pan_id = 13001;
+          ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
+          transmit_power = 20;
+        };
+        mqtt = {
+          version = 5;
+          server = "mqtt://localhost:1883";
+        };
+      };
+    };
+
+    modules.services.borgmatic.directories = [
+      config.services.mosquitto.dataDir
+      config.services.zigbee2mqtt.dataDir
+    ];
+
+    services.home-assistant = {
+      config.mqtt = {};
+      extraComponents = [
+        "mqtt"
+        "mqtt_eventstream"
+        "mqtt_json"
+        "mqtt_room"
+        "mqtt_statestream"
+      ];
+    };
+  };
+}

pkgs/ha-floorplan/package.nix

@@ -0,0 +1,38 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "floorplan";
+  version = "1.0.44";
+
+  src = fetchFromGitHub {
+    owner = "ExperienceLovelace";
+    repo = "ha-floorplan";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ajEA47H9nFXVcuvhwkDsxc5YYQWMsUXqHQ3t6tuAaxc=";
+  };
+
+  npmDepsHash = "sha256-/6H3XMraD7/usZBwmQaCDpV2n1Eed+U+G0f2YnjyWgk=";
+
+  installPhase = ''
+    runHook preInstall
+    mkdir $out
+    cp -R dist/* $out/
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Floorplan for Home Assistant";
+    longDescription = ''
+      Bring new life to Home Assistant. By mapping entities to a SVG-object,
+      you're able to control devices, show states, calling services - and much
+      more. Add custom styling on top, to visualize whatever you can think of.
+      Your imagination just became the new limit.
+    '';
+    homepage = "https://github.com/ExperienceLovelace/ha-floorplan";
+    license = lib.licenses.asl20;
+  };
+}

pkgs/streamrip/ensure-the-default-config-file-is-writable.patch

@@ -1,26 +0,0 @@
-From 18efb9b5c8e562b169425f6ba79977e52e8b91b9 Mon Sep 17 00:00:00 2001
-From: Pavel Sobolev <paveloomm@gmail.com>
-Date: Sat, 13 Jan 2024 12:49:45 +0000
-Subject: [PATCH] Ensure the default config file is writable.
-
----
- streamrip/config.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/streamrip/config.py b/streamrip/config.py
-index 7ee2f57..88a5fef 100644
---- a/streamrip/config.py
-+++ b/streamrip/config.py
-@@ -378,6 +378,9 @@ def set_user_defaults(path: str, /):
-     """Update the TOML file at the path with user-specific default values."""
-     shutil.copy(BLANK_CONFIG_PATH, path)
-
-+    # Ensure the default config file is writable
-+    os.chmod(path, 0o644)
-+
-     with open(path) as f:
-         toml = parse(f.read())
-     toml["downloads"]["folder"] = DEFAULT_DOWNLOADS_FOLDER  # type: ignore
---
-2.42.0
-

pkgs/streamrip/package.nix

@@ -1,78 +0,0 @@
-{ lib
-, python3Packages
-, fetchFromGitHub
-
-, ffmpeg
-}:
-
-python3Packages.buildPythonApplication {
-  pname = "streamrip";
-  version = "2.0.7";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "nathom";
-    repo = "streamrip";
-    rev = "46b570dbb6f81d604cbaa3bfa379463e0a20a841";
-    hash = "sha256-LD99OjguaBnrQxCwmCeHvmBMq5aOfobwnMd5/aCRZW8=";
-  };
-
-  patches = [
-    ./ensure-the-default-config-file-is-writable.patch
-  ];
-
-  nativeBuildInputs = with python3Packages; [
-    poetry-core
-  ];
-
-  propagatedBuildInputs = with python3Packages; [
-    aiodns
-    aiofiles
-    aiohttp
-    aiolimiter
-    appdirs
-    cleo
-    click-help-colors
-    deezer-py
-    m3u8
-    mutagen
-    pathvalidate
-    pillow
-    pycryptodomex
-    pytest-asyncio
-    pytest-mock
-    rich
-    simple-term-menu
-    tomlkit
-    tqdm
-  ];
-
-  nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-  ];
-
-  prePatch = ''
-    sed -i 's#aiofiles = ".*"#aiofiles = "*"#' pyproject.toml
-    sed -i 's#deezer-py = ".*"#deezer-py = "*"#' pyproject.toml
-    sed -i 's#m3u8 = ".*"#m3u8 = "*"#' pyproject.toml
-    sed -i 's#pathvalidate = ".*"#pathvalidate = "*"#' pyproject.toml
-    sed -i 's#Pillow = ".*"#Pillow = "*"#' pyproject.toml
-    sed -i 's#pytest-asyncio = ".*"#pytest-asyncio = "*"#' pyproject.toml
-    sed -i 's#tomlkit = ".*"#tomlkit = "*"#' pyproject.toml
-
-    sed -i 's#"ffmpeg"#"${lib.getBin ffmpeg}/bin/ffmpeg"#g' streamrip/client/downloadable.py
-  '';
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  meta = with lib; {
-    description = "Scriptable music downloader for Qobuz, Tidal, SoundCloud, and Deezer";
-    homepage = "https://github.com/nathom/streamrip";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ paveloom ];
-    mainProgram = "rip";
-  };
-}
-