flake.lock: Update

Flake lock file updates: • Updated input 'nixos': 'github:SuperSandro2000/nixpkgs/f90c2ca3c212d2cd8d10680cea728411661eeb1a' (2024-02-01) → 'github:SuperSandro2000/nixpkgs/2d8560f2c9f919096538321526a9c960216baf67' (2024-02-01) • Updated input 'nixos-hardware': 'github:nixos/nixos-hardware/cc65e27670abccced5997d4a93c4c930aef6fd0b' (2024-02-01) → 'github:nixos/nixos-hardware/83e571bb291161682b9c3ccd48318f115143a550' (2024-02-02) • Updated input 'nixos-modules': 'github:SuperSandro2000/nixos-modules/453f941ff2cde75a5aac5d99c695d368fa28b7e1' (2024-01-31) → 'github:SuperSandro2000/nixos-modules/549cedc09ba8acc4534f37fb49bfd2ddf49cb10b' (2024-02-04) • Updated input 'nixos-unstable': 'github:SuperSandro2000/nixpkgs/20fd65063be023f4436bb24feb66256e27062d95' (2024-02-01) → 'github:SuperSandro2000/nixpkgs/81e3efdc9aba5aa2da626c765db6469b9c18a708' (2024-02-03) • Updated input 'openwrt-imagebuilder': 'github:astro/nix-openwrt-imagebuilder/0d4ae6b68cf5bdddbcc93a5a8c6d271ff867534a' (2024-02-01) → 'github:astro/nix-openwrt-imagebuilder/f95c2aab7d994c76150e330d19c4d4375d433e26' (2024-02-03)
home-assistant: configure admin group, remove moved patches
2024-02-04 03:11:30 +01:00 · 2024-02-04 03:10:43 +01:00 · 2024-02-03 23:20:29 +01:00
6 changed files with 29 additions and 61 deletions
--- a/config/default.nix
+++ b/config/default.nix
@ -207,7 +207,10 @@

    hedgedoc.ldap.userGroup = "hedgedoc-users";

-    home-assistant.ldap.userGroup = "home-assistant-users";
+    home-assistant.ldap = {
+      adminGroup = "home-assistant-admins";
+      userGroup = "home-assistant-users";
+    };

    hydra.ldap = {
      roleMappings = [
--- a/flake.lock
+++ b/flake.lock
@ -363,11 +363,11 @@
    },
    "nixos": {
      "locked": {
-        "lastModified": 1706814951,
-        "narHash": "sha256-ZDO8eBHZBG4pNOtJjP8E/gDlLDGRMclJDq8aFJruFCQ=",
+        "lastModified": 1706829860,
+        "narHash": "sha256-DtbhW83ykv0VazO9aCOWg1hHZdY5V5yI1+ors2xiCOI=",
        "owner": "SuperSandro2000",
        "repo": "nixpkgs",
-        "rev": "f90c2ca3c212d2cd8d10680cea728411661eeb1a",
+        "rev": "2d8560f2c9f919096538321526a9c960216baf67",
        "type": "github"
      },
      "original": {
@ -379,11 +379,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1706782449,
-        "narHash": "sha256-8hEkOJDqR+7gJvXzwIM/VhR9iQzZyrNeh68u+Et2TzA=",
+        "lastModified": 1706834982,
+        "narHash": "sha256-3CfxA7gZ+DVv/N9Pvw61bV5Oe/mWfxYPyVQGqp9TMJA=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "cc65e27670abccced5997d4a93c4c930aef6fd0b",
+        "rev": "83e571bb291161682b9c3ccd48318f115143a550",
        "type": "github"
      },
      "original": {
@ -402,11 +402,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706740920,
-        "narHash": "sha256-uFwu44BZf17WYMAEmYIcdtVyNLDRVselv3rNsm7PYeE=",
+        "lastModified": 1707012624,
+        "narHash": "sha256-z+iN2Ey1yspl+J8AQ7C/mrC/XY1c3HKEkQVT1FwqqeU=",
        "owner": "SuperSandro2000",
        "repo": "nixos-modules",
-        "rev": "453f941ff2cde75a5aac5d99c695d368fa28b7e1",
+        "rev": "549cedc09ba8acc4534f37fb49bfd2ddf49cb10b",
        "type": "github"
      },
      "original": {
@ -417,11 +417,11 @@
    },
    "nixos-unstable": {
      "locked": {
-        "lastModified": 1706802878,
-        "narHash": "sha256-6ZWFH1BEUlMIcsImcpeZcNvNC9wpXUhkenAm31d80Xg=",
+        "lastModified": 1707002773,
+        "narHash": "sha256-NypPfMzBPNaLtoRnsmrcCDJmhhpyT2ftnHpj4H4lziY=",
        "owner": "SuperSandro2000",
        "repo": "nixpkgs",
-        "rev": "20fd65063be023f4436bb24feb66256e27062d95",
+        "rev": "81e3efdc9aba5aa2da626c765db6469b9c18a708",
        "type": "github"
      },
      "original": {
@ -472,11 +472,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706782913,
-        "narHash": "sha256-c3HVJ0EYWBZf2IeAjkD6Lup7oqpe5cv0URIIFA8DgTw=",
+        "lastModified": 1706954722,
+        "narHash": "sha256-Jnab1aNlCH5/W5Lm6NtnzklYUCmzOG5/SWHT+K5kH6Y=",
        "owner": "astro",
        "repo": "nix-openwrt-imagebuilder",
-        "rev": "0d4ae6b68cf5bdddbcc93a5a8c6d271ff867534a",
+        "rev": "f95c2aab7d994c76150e330d19c4d4375d433e26",
        "type": "github"
      },
      "original": {
--- a/hosts/home-assistant/default.nix
+++ b/hosts/home-assistant/default.nix
@ -98,10 +98,7 @@ in
        "zha" # Zigbee
      ];
      ldap.enable = true;
-      package = (pkgs.home-assistant.override {
-        extraPackages = ps: with ps; [
-          pyqrcode # for TOTP qrcode
-        ];
+      package = pkgs.home-assistant.override {
        # those tests take a long(er) time and can't be sped up with pytest-xdist
        packageOverrides = _: prev: let
          noTests.doCheck = false;
@ -109,14 +106,7 @@ in
          aws-sam-translator = prev.aws-sam-translator.overridePythonAttrs (_: noTests);
          moto = prev.moto.overridePythonAttrs (_: noTests);
        };
-      }).overrideAttrs ({ patches ? [ ], ... }: {
-        patches = patches ++ [
-          ../../overlays/home-assistant-local_temperature_calibration.diff
-          ../../overlays/home-assistant-no-cloud.diff
-        ];
-
-        doInstallCheck = false;
-      });
+      };
    };

    nginx = {
--- a/overlays/home-assistant-local_temperature_calibration.diff
+++ b/overlays/home-assistant-local_temperature_calibration.diff
@ -1,15 +0,0 @@
-diff --git a/homeassistant/components/zha/number.py b/homeassistant/components/zha/number.py
-index 24964d7a15..4c43958f41 100644
--- a/homeassistant/components/zha/number.py
-+++ b/homeassistant/components/zha/number.py
-@@ -956,8 +956,8 @@ class ThermostatLocalTempCalibration(ZHANumberConfigurationEntity):
-     """Local temperature calibration."""
- 
-     _unique_id_suffix = "local_temperature_calibration"
-    _attr_native_min_value: float = -2.5
-    _attr_native_max_value: float = 2.5
-+    _attr_native_min_value: float = -5.0
-+    _attr_native_max_value: float = 5.0
-     _attr_native_step: float = 0.1
-     _attr_multiplier: float = 0.1
-     _attribute_name = "local_temperature_calibration"
--- a/overlays/home-assistant-no-cloud.diff
+++ b/overlays/home-assistant-no-cloud.diff
@ -1,10 +0,0 @@
--- a/homeassistant/components/default_config/manifest.json	2023-10-22 01:46:48.596580412 +0200
-+++ b/homeassistant/components/default_config/manifest.json	2023-10-22 01:47:01.916784170 +0200
-@@ -7,7 +7,6 @@
-     "assist_pipeline",
-     "automation",
-     "bluetooth",
-    "cloud",
-     "conversation",
-     "counter",
-     "dhcp",
--- a/packages.nix
+++ b/packages.nix
@ -30,7 +30,7 @@ lib.attrsets.mapAttrs
      ln -s $src $out
    '';

-    list-upgradable = pkgs.writeScriptBin "list-upgradable" ''
+    list-upgradable = pkgs.writeShellScriptBin "list-upgradable" ''
      set -eou pipefail

      NORMAL="\033[0m"
@ -77,7 +77,7 @@ lib.attrsets.mapAttrs
      '') (builtins.attrNames self.nixosConfigurations)}
    '';

-    prebuild-all-remote = pkgs.writeScriptBin "prebuild-all" ''
+    prebuild-all-remote = pkgs.writeShellScriptBin "prebuild-all" ''
      set -eou pipefail

      nix copy --no-check-sigs --to ssh-ng://$1 ${inputPaths}
@ -108,7 +108,7 @@ lib.attrsets.mapAttrs
        # Generate a small script for copying this flake to the
        # remote machine and bulding and switching there.
        # Can be run with `nix run c3d2#…-nixos-rebuild switch`
-        "${name}-nixos-rebuild" = pkgs.writeScriptBin "${name}-nixos-rebuild" ''
+        "${name}-nixos-rebuild" = pkgs.writeShellScriptBin "${name}-nixos-rebuild" ''
          set -eou pipefail

          ${lib.optionalString (hostConfig.c3d2.deployment.server or "" != "") ''
@ -133,7 +133,7 @@ lib.attrsets.mapAttrs
          END
        '';

-        "${name}-nixos-rebuild-hydra" = pkgs.writeScriptBin "${name}-nixos-rebuild" /* bash */ ''
+        "${name}-nixos-rebuild-hydra" = pkgs.writeShellScriptBin "${name}-nixos-rebuild" /* bash */ ''
          set -eou pipefail

          echo Copying Flakes
@ -160,7 +160,7 @@ lib.attrsets.mapAttrs
          EOF
        '';

-        "${name}-nixos-rebuild-local" = pkgs.writeScriptBin "${name}-nixos-rebuild" /* bash */ ''
+        "${name}-nixos-rebuild-local" = pkgs.writeShellScriptBin "${name}-nixos-rebuild" /* bash */ ''
          set -eou pipefail

          if [[ ''${1:-} == build ]]; then
@ -174,7 +174,7 @@ lib.attrsets.mapAttrs
          _NIXOS_REBUILD_REEXEC=1 ${lib.getExe pkgs.nixos-rebuild} ${rebuildArg} --target-host ${target} --use-remote-sudo "$@"
        '';

-        "${name}-cleanup" = pkgs.writeScriptBin "${name}-cleanup" ''
+        "${name}-cleanup" = pkgs.writeShellScriptBin "${name}-cleanup" ''
          set -eou pipefail
          ssh ${target} "time nix-collect-garbage -d && time nix-store --optimise"
        '';
@ -203,7 +203,7 @@ lib.attrsets.mapAttrs
        '';
      in {

-        "microvm-update-${name}" = pkgs.writeScriptBin "microvm-update-${name}" (
+        "microvm-update-${name}" = pkgs.writeShellScriptBin "microvm-update-${name}" (
          if builtins.elem (hostConfig.c3d2.deployment.server or null) [ "server9" "server10" ]
          then let
            closureInfo = pkgs.closureInfo { rootPaths = [ hostConfig.system.build.toplevel ]; };
@ -250,7 +250,7 @@ lib.attrsets.mapAttrs
          else throw "${name} is not configured to run on microvm.nix. Is it a physical host or is it deployed in Skyflake?"
        );

-        "microvm-update-${name}-local" = pkgs.writeScriptBin "microvm-update-${name}" ''
+        "microvm-update-${name}-local" = pkgs.writeShellScriptBin "microvm-update-${name}" ''
          set -eou pipefail

          ${lib.optionalString (!builtins.elem (hostConfig.c3d2.deployment.server or null) [ "server9" "server10" ]) ''