many changes

2024-11-15 02:30:04 +01:00
parent 1746412a11
commit bd9f1ce260
22 changed files with 412 additions and 170 deletions
--- a/hosts/fw.cloonar.com/modules/gitea.nix
+++ b/hosts/fw.cloonar.com/modules/gitea.nix
@@ -35,9 +35,12 @@ in
        isReadOnly = false;
      };
      "/var/lib/acme/gitea/" = {
-        hostPath = "${config.security.acme.certs.${domain}.directory}";
+        hostPath = config.security.acme.certs.${domain}.directory;
        isReadOnly = true;
      };
+      "/run/secrets/gitea-mailer-password" = {
+        hostPath = config.sops.secrets.gitea-mailer-password.path;
+      };
    };
    config = { lib, config, pkgs, ... }: {
      imports = [
@@ -73,6 +76,7 @@ in
      services.gitea = {
        enable = true;
        appName = "Cloonar Gitea server"; # Give the site a name
+        mailerPasswordFile = "/run/secrets/gitea-mailer-password";
        settings = {
          server = {
            ROOT_URL = "https://${domain}/";
@@ -89,6 +93,14 @@ in
            ALLOW_ONLY_EXTERNAL_REGISTRATION              = true;
            SHOW_REGISTRATION_BUTTON                      = false;
          };
+          mailer = {
+            ENABLED        = true;
+            FROM           = "Gitea Cloonar <gitea@cloonar.com>";
+            PROTOCOL       = "smtp+starttls";
+            SMTP_ADDR      = "mail.cloonar.com";
+            SMTP_PORT      = 587;
+            USER           = "gitea@cloonar.com";
+          };
          actions.ENABLED=true;
        };
      };
@@ -107,4 +119,8 @@ in
  };

  sops.secrets.gitea-runner = {};
+  sops.secrets.gitea-mailer-password = {
+    owner = "gitea";
+    restartUnits = [ "container@git.service" ];
+  };
 }
--- a/hosts/fw.cloonar.com/modules/home-assistant/custom-components/lovelace-scheduler.nix
+++ b/hosts/fw.cloonar.com/modules/home-assistant/custom-components/lovelace-scheduler.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "lovelace-scheduler";
+  version = "3.2.13";
+
+  src = fetchFromGitHub {
+    owner = "nielsfaber";
+    repo = "scheduler-card";
+    rev = "v${version}";
+    hash = "sha256-LFKOTu0SBeHpf8Hjvsgc/xOUux9d4lBCshdD9u7eO5o=";
+  };
+
+  npmDepsHash = "sha256-JJexFmVbDHi2JCiCpcDupzVf0xfwy+vqWILq/dLVcBo=";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    cp scheduler-card.js $out
+
+    runHook postInstall
+  '';
+
+  passthru.entrypoint = "scheduler-card.js";
+
+  meta = with lib; {
+    description = "This is a Lovelace card for Home Assistant that can be used to create a time schedule for your smart devices. You can create new rules, modify existing rules and temporarily disable rules.";
+    homepage = "https://github.com/nielsfaber/scheduler-card";
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
--- a/hosts/fw.cloonar.com/modules/home-assistant/custom-components/scheduler.nix
+++ b/hosts/fw.cloonar.com/modules/home-assistant/custom-components/scheduler.nix
@@ -0,0 +1,30 @@
+{
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  lib,
+  gitUpdater,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "KartoffelToby";
+  domain = "scheduler";
+  version = "3.3.7";
+
+  src = fetchFromGitHub {
+    owner = "nielsfaber";
+    repo = "scheduler-component";
+    rev = "refs/tags/${version}";
+    hash = "sha256-zXO2UDLhSTOemzsO9G5ZUzr50Zg8kDW/aObn6Y3j70k=";
+  };
+
+  passthru.updateScript = gitUpdater {
+    ignoredVersions = "(Alpha|Beta|alpha|beta).*";
+  };
+
+  meta = {
+    changelog = "https://github.com/nielsfaber/scheduler-component/releases/tag/${version}";
+    description = "This is a custom component for Home Assistant, that is used for controlling your existing devices based on time. It works nicely together with the Lovelace scheduler card.";
+    homepage = "https://github.com/nielsfaber/scheduler-component";
+    license = lib.licenses.agpl3Only;
+  };
+}
--- a/hosts/fw.cloonar.com/modules/home-assistant/light.nix
+++ b/hosts/fw.cloonar.com/modules/home-assistant/light.nix
@@ -14,6 +14,11 @@
        };
      };
    };
+    customize_domain = {
+      light = {
+        assumed_state = false;
+      };
+    };
    "automation light_sunrise" = {
      alias = "light_sunrise";
      trigger = {
@@ -58,7 +63,7 @@
          "light.livingroom_lights"
          "light.hallway_lights"
          "light.bathroom_lights"
-          "light.toilett_lights"
+          "light.toilet_lights"
          "light.storage_lights"
        ];
        to = "on";
@@ -67,7 +72,7 @@
        {
          choose = [
            {
-              conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and trigger.entity_id == 'light.toilett_lights' }}" ];
+              conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and trigger.entity_id == 'light.toilet_lights' }}" ];
              sequence = [
                {
                  service = "light.turn_on";
@@ -105,7 +110,7 @@
                    entity_id = "{{ trigger.entity_id }}";
                  };
                  data = {
-                    brightness_pct = 45;
+                    brightness_pct = 30;
                    rgbw_color = [ 255 126 0 255 ];
                  };
                }
--- a/hosts/fw.cloonar.com/modules/unbound.nix
+++ b/hosts/fw.cloonar.com/modules/unbound.nix
@@ -23,9 +23,9 @@ let
  cfg = {
    remote-control.control-enable = true;
    server = {
-      # include = [
-      #   "\"${adblockLocalZones}\""
-      # ];
+      include = [
+        "\"${adblockLocalZones}\""
+      ];
      interface = [ "0.0.0.0" "::0" ];
      interface-automatic = "yes";
      access-control = [
--- a/hosts/fw.cloonar.com/secrets.yaml
+++ b/hosts/fw.cloonar.com/secrets.yaml
@@ -6,9 +6,9 @@ wg_cloonar_key: ENC[AES256_GCM,data:Dtp6I5J0jU5LLVwEFU4DFCpUngPRmFMebGXnk2oSwsKt
 wg_epicenter_works_key: ENC[AES256_GCM,data:LeLjfwfaz+loWyHYRgIMIPzHzlOnhl9tluKcQFgdes6r+deft1JfnUzDuF0=,iv:DKrc3I+U2hWDH8nnc8ZQeaVtA1eVXu7SXdTn1fxHoH4=,tag:V0PL0GrL2NEPVslAZa801A==,type:str]
 wg_epicenter_works_psk: ENC[AES256_GCM,data:Den3NDWdP013Or6/2Vll1igUahuRSNW4hu+nDa5vkr93bbveQTaWFT4TD4U=,iv:r3UsD3+3lUIP2X3Grti7wpXTQBXtu1/MdrycEmpZfsI=,tag:ghbAcxmjGVOe9jCZsmFzjA==,type:str]
 wg_ghetto_at_key: ENC[AES256_GCM,data:OIHmoy3SpIi9aefZnZ1PzpyHbEso18ceoTULf2eQkx1rJbaxC6PD1lma7eQ=,iv:u0eFjHHOBzPTmBvBEQsYY5flcBayiAQKd6e7RyiPwJI=,tag:731C9wvv8bA5fuuQq+weVQ==,type:str]
+gitea-mailer-password: ENC[AES256_GCM,data:M4qCWNt1oQVJzxThIjocm2frwuVMyx+69TBpke25RwxJxEQnvHL1CM579OVroTm7+gGE/oOJqAwDIepfiDtyM1xm,iv:jayFZMbu3uDimS/rIKZSeoU0MsYwWp880iEMs1oQE4k=,tag:qGDncRkyuCWaELhcxUrqtQ==,type:str]
 gitea-runner: ENC[AES256_GCM,data:IRx9QzbLJrkF/DYvpVf2012BiSBnHZJe10opkRO2kJuegdb0denW3mvmnU4isoj7jO/0QyN6HZHlHb5ihC7fFl4LavPDVjAAhZPynkpDw9IHFeqZDUSPzxQsq7FibKmfEpEmWEz+Npe8JI1kl694XYV/kqErKa3JrZS7Jm8zFcv7DSY/V5bdy4Is8ZSRtHiP/aVzFdsvjwtissCDnCl7zRZjXUcN0FssvPHBZHxLuc68EoagIw1aVSzkvSVBXer4rFdlefjskFelRnUr3pvm188=,iv:VnvPFDFGz/QyfQmZxQFB3J2ReqaHdRaypb2Vnq7Dthw=,tag:19rx0nlmXLj/6yPRAFGigA==,type:str]
 gitea-runner-token: ENC[AES256_GCM,data:Nd0vsnuJficsdZaqeBZXa9vD7PLMdDtV9sMX0TxUSEMNU7Reu3HLCWuvP0easPU=,iv:4mrfQc1tobg/QiExUuWST6iU9TdNwiS1BMmOnQqCFZU=,tag:85aRoD3IkRq3mcoPdLKaBQ==,type:str]
-drone: ENC[AES256_GCM,data:S8WTZqGHfcdpSojavZ87GdE5dagcTAdHBVQEbHHgnB4V7aczS6c5QdEJxK920Pjpf6o54OOQYniVsPiiXSxwjExDKPzhs/DG2hfigmf8RgfkP+3tF2W0KiPmV2jxog8w226ZKnI+hSBs8tuIfJBhrpY7Y/YNmTPfq+cnnLS8ibYqytcpzoogI9I8THzHCu3r+yejoGSyTMs9L4gPhOjz5aK4UV6V,iv:zqN/aSBI3xGGNDnpHPGyQnQP2YZOGUk6dAGtON/QlHU=,tag:o9YFDKAB5uR9lPmChyxB8g==,type:str]
 home-assistant-ldap: ENC[AES256_GCM,data:uZEPbSnkgQYSd8ev6FD8TRHWWr+vusadtMcvP7KKL2AZAV0h1hga5fODN6I5u0DNL9hq2pNM+FwU0E/svWLRww==,iv:IhmUgSu34NaAY+kUZehx40uymydUYYAyte1aGqQ33/8=,tag:BKFCJPr7Vz4EG78ry/ZD7g==,type:str]
 home-assistant-secrets.yaml: ENC[AES256_GCM,data:m7uOVo7hPk/RmqqRS6y7NKoMKsR9Bdi1ntatsZdDOAbJMjZmZL2FgPEHi/zF73zCfRfTOca3dwpulR3WXZ9Ic1sbUIggmusJMg4Gellw1CUhx7SbQN5nieAbPbB9GVxMuV4OakD1u7Swz8JggDT6IwojSnuD5omCRCyUH1wvKB+Re59q6EStderlm5MJNVFlVrbKVbLKLcw4yRgTh34BGnTTjcJmgSlQjO1ciu2B7YQmdl0Fw6d8AdbEzgB5TFG5ONc85UhJDE8Wlw==,iv:GCtpcVChN2UMWtfnWURozCfVj2YbRPqp/bH4Jjntybs=,tag:pcxP7gTBtXMNT5iyW5YXTw==,type:str]
 matrix-shared-secret: ENC[AES256_GCM,data:67imd3m6WBeGP/5Msmjy8B6sP983jMyWzRIzWgNVV5jZslX+GBJyEYzm3OTDs1iTZf4ScvuYheTH0QFPfw==,iv:7ElCpESWumbIHmmFaedcpkFm5M58ZT3vW9wb9e1Sbh4=,tag:wr4FIymtJBtCerVqae+Xlw==,type:str]
@@ -57,8 +57,8 @@ sops:
            WXJpUUxadERyYUExRFMzNzBXaUVET3cKG9ZwWy5YvTr/BAw/i+ZJos5trwRvaW5j
            eV/SHiEteZZtCuCVFAp3iolE/mJyu97nA2yFwWaLN86h+/xkOJsdqA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-10-13T22:30:43Z"
-    mac: ENC[AES256_GCM,data:sEySfQaBevydqFBOab7RPCse8fOwiix6GIsXeR9paBCCCHOxDZDusdn0/k97wLeWzvHi0SJB/8+g8qlqXtRuJ/3mT1vJxfWwoJk3gz2WD+d8recG+KkdtkSGu04addHgBZQqGqhOfkRHYypVW3GaBfLteY08nvob4/yjaHCtGig=,iv:lsHvIovstgHmY6OrV3CO0tju2OQb1AcWgMov8klkSqA=,tag:zcvCoCwTgeZhhS1MOvH3HA==,type:str]
+    lastmodified: "2024-11-12T19:36:40Z"
+    mac: ENC[AES256_GCM,data:Fn/YkHb9qwTRpm8KfII+rwHEvrZ+en4AzTqkrsubR1o+7cQ3NZkU1/DOLxTz/CJ4Eq68scg0rYr+0Q1FI27ypoYwQR5+8K9RDJkIM5JDt1afovx4UysyP8peLL+Ccl27YRGbjWGrprzF5oWUWee0nztI4H6+R9NyYdCZ0JVo8/8=,iv:DwmsWE4d4aTxy/1wCP7wWm+TtZ0VEmF0TVY+8G66ZEs=,tag:mRNUTlrCKusvlWasio78YA==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1