diff --git a/flake.lock b/flake.lock index 219a7e9..08a9fae 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1723080788, - "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", + "lastModified": 1722821805, + "narHash": "sha256-FGrUPUD+LMDwJsYyNSxNIzFMldtCm8wXiQuyL2PHSrM=", "owner": "nix-community", "repo": "disko", - "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", + "rev": "0257e44f4ad472b54f19a6dd1615aee7fa48ed49", "type": "github" }, "original": { @@ -887,11 +887,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1723118537, - "narHash": "sha256-PdpCYxN6/E1oXKvm4Co+luIIXDknPdhADTRuybyGfE4=", + "lastModified": 1723027119, + "narHash": "sha256-1bGPoHN9LgGvSr5VhCifz7KID0lA4OADAJYoE1ZLNa0=", "ref": "refs/heads/main", - "rev": "a957219df2b7f360695f884f45fe4802240b9755", - "revCount": 16092, + "rev": "27a63db710f1b923fcc74873d70c7e0bfc4ea092", + "revCount": 16081, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -1567,11 +1567,11 @@ ] }, "locked": { - "lastModified": 1723056346, - "narHash": "sha256-YpzywjTAUHRRHcO8zz9x2gYqJ0JmZlcB9+RaUvD89qM=", + "lastModified": 1722857853, + "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3c977f1c9930f54066c085305b4b2291385e7a73", + "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da", "type": "github" }, "original": { diff --git a/hosts/default.nix b/hosts/default.nix index 198b282..16a5f4f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -181,11 +181,7 @@ "hass-ssh-key".owner = "hass"; # "matrix-registration-shared-secret".owner = "matrix-synapse"; # "matrix-sliding-sync-secret".owner = "matrix-synapse"; - "autistici-password" = { - # FIXME terrible, should create a third ad-hoc group - owner = "grafana"; - group = "forgejo"; - }; + "autistici-password".owner = "forgejo"; "garmin-collector-environment".owner = "garmin-collector"; }; }; diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix index a4fead7..f86b986 100644 --- a/hosts/sisko/default.nix +++ b/hosts/sisko/default.nix @@ -120,7 +120,7 @@ boot.tmp.cleanOnBoot = true; fileSystems."/mnt/hd" = { - device = "/dev/disk/by-id/ata-WDC_WD5000AAKX-08U6AA0_WD-WCC2E5TR40FU-part1"; + device = "/dev/disk/by-id/ata-WDC_WD10EADS-22M2B0_WD-WCAV52709550-part1"; fsType = "ext4"; options = ["nofail"]; }; diff --git a/modules/grafana/default.nix b/modules/grafana/default.nix index 33d93f7..98624b8 100644 --- a/modules/grafana/default.nix +++ b/modules/grafana/default.nix @@ -14,13 +14,6 @@ in { admin_user = "andrea"; admin_password = "$__file{${config.age.secrets.grafana-password.path}}"; }; - smtp = { - enabled = true; - host = "smtp.autistici.org:587"; - user = "andrea.ciceri@autistici.org"; - from_address = "andrea.ciceri@autistici.org"; - password = "$__file{${config.age.secrets.autistici-password.path}}"; - }; }; }; environment.persistence."/persist".directories = [ diff --git a/modules/home-assistant/default.nix b/modules/home-assistant/default.nix index 1ffe137..e40f0ed 100644 --- a/modules/home-assistant/default.nix +++ b/modules/home-assistant/default.nix @@ -12,8 +12,8 @@ pun_sensor = pkgs.fetchFromGitHub { owner = "virtualdj"; repo = "pun_sensor"; - rev = "51b216fab5c0d454d66060647c36e81bebfaf059"; - hash = "sha256-bGVJx3bObXdf4AiC6bDvafs53NGS2aufRcTUmXy8nAI="; + rev = "19f270b353594ab536f9dc42adf31427e7a81562"; + hash = "sha256-3pL+8CXzjmR54Ff9qLhHzC/C+uns0qWEgJFHv+K4MFs="; }; cozy_life = pkgs.fetchFromGitHub { owner = "yangqian"; @@ -21,12 +21,6 @@ rev = "9a40a2fa09b0f74aee0b278e2858f5600b3487a9"; hash = "sha256-i+82EUamV1Fhwhb1vhRqn9aA9dJ0FxSSMD734domyhw="; }; - garmin_connect = pkgs.fetchFromGitHub { - owner = "cyberjunky"; - repo = "home-assistant-garmin_connect"; - rev = "d42edcabc67ba6a7f960e849c8aaec1aabef87c0"; - hash = "sha256-KqbP6TpH9B0/AjtsW5TcWSNgUhND+w8rO6X8fHqtsDI="; - }; tuya-device-sharing-sdk = ps: ps.callPackage ( { @@ -108,9 +102,6 @@ in { holidays beautifulsoup4 (tuya-device-sharing-sdk python3Packages) # remove after https://github.com/NixOS/nixpkgs/pull/294706/ - getmac - garminconnect - tzlocal ]; config = { default_config = {}; @@ -175,8 +166,7 @@ in { systemd.tmpfiles.rules = [ "d ${config.services.home-assistant.configDir}/custom_components 770 hass hass" - "C+ ${config.services.home-assistant.configDir}/custom_components/pun_sensor 770 hass hass - ${pun_sensor}/custom_components/pun_sensor" - "C+ ${config.services.home-assistant.configDir}/custom_components/garmin_connect 770 hass hass - ${garmin_connect}/custom_components/garmin_connect" + "L+ ${config.services.home-assistant.configDir}/custom_components/pun_sensor - - - - ${pun_sensor}/custom_components/pun_sensor" "d ${config.services.home-assistant.configDir}/.ssh 770 hass hass" "C ${config.services.home-assistant.configDir}/.ssh/id_ed25519 700 hass hass - ${config.age.secrets.hass-ssh-key.path}" diff --git a/modules/prometheus-exporters/default.nix b/modules/prometheus-exporters/default.nix index 7a55821..a56d1cb 100644 --- a/modules/prometheus-exporters/default.nix +++ b/modules/prometheus-exporters/default.nix @@ -49,7 +49,7 @@ in { nginx = mkFor ["sisko"] { enable = true; }; - smartctl = mkFor ["sisko" "picard"] { + smartctl = mkFor ["sisko"] { enable = true; }; };