diff --git a/flake.lock b/flake.lock index 076fc1e..e817d79 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1765495779, + "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", "type": "github" }, "original": { @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1765464257, + "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509", "type": "github" }, "original": { @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1765823531, + "narHash": "sha256-tyNJjd48hfgsyEfsq1Ueufg4oJv6b8xBA6NYRJrLPyg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "8315c1544f383b791a3115c9959d1f27920e8320", "type": "github" }, "original": { @@ -333,11 +333,11 @@ ] }, "locked": { - "lastModified": 1763265660, - "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "469ef53571ea80890c9497952787920c79c1ee6e", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -395,11 +395,11 @@ ] }, "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "lastModified": 1764234087, + "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -486,11 +486,11 @@ }, "nixpkgs-s": { "locked": { - "lastModified": 1763682598, - "narHash": "sha256-1vlouRdKg6PF8dzTbiT1BB+VwLGkaVUgrDt9NKoiisY=", + "lastModified": 1765810042, + "narHash": "sha256-OQ6DsZXvuP7MOcL/q14c3RfJIWkJ6Geix8e2MHBLVuA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70fca9810d7049ec65e7aae5b885d7bde224f966", + "rev": "74a8157d371967fae15517731789d9b01661d048", "type": "github" }, "original": { @@ -502,11 +502,11 @@ }, "nixpkgs-u": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b845f02..cbe2d01 100644 --- a/flake.nix +++ b/flake.nix @@ -119,6 +119,7 @@ wl-clipedit wl-lockscreen wl-update-background + home-assistant ; # ==================================================================== diff --git a/instances/freya/configuration.nix b/instances/freya/configuration.nix index 8c27723..9bc7793 100644 --- a/instances/freya/configuration.nix +++ b/instances/freya/configuration.nix @@ -301,13 +301,9 @@ in "device_automation" "device_sun_light_trigger" "device_tracker" - "dlib_face_detect" - "dlib_face_identify" "dlna_dmr" "dlna_dms" "esphome" - "flux" - "gdacs" "google" "google_translate" "group" diff --git a/instances/heimdall/configuration.nix b/instances/heimdall/configuration.nix index 3d4ebe3..0e7eabc 100644 --- a/instances/heimdall/configuration.nix +++ b/instances/heimdall/configuration.nix @@ -229,34 +229,10 @@ in assist_pipeline = { }; # bluetooth = { }; - camera = [ - # { platform = "local_file"; file_path = "/tmp/doods_camera_camera_cancello.jpg"; name = "File DOODS2 Camera cancello"; } - # { platform = "local_file"; file_path = "/tmp/doods_camera_camera_vialetto.jpg"; name = "File DOODS2 Camera vialetto"; } - # { platform = "local_file"; file_path = "/tmp/doods_camera_camera_garage.jpg"; name = "File DOODS2 Camera garage"; } - ]; + camera = [ ]; cloud = { }; config = { }; - # device_tracker = [{ - # platform = "bluetooth_tracker"; - # request_rssi = true; - # }]; - image_processing = [ - # { - # platform = "doods"; - # url = "http://localhost:8080"; - # detector = "default"; - # source = [ - # { entity_id = "camera.camera_camera_cancello"; name = "DOODS2 Camera cancello"; } - # { entity_id = "camera.camera_camera_vialetto"; name = "DOODS2 Camera vialetto"; } - # { entity_id = "camera.camera_camera_garage"; name = "DOODS2 Camera garage"; } - # ]; - # confidence = 60; - # file_out = "/tmp/doods_{{ camera_entity.split('.')[1] }}.jpg"; - # scan_interval = 5; - # labels = [ "bicycle" "car" "cat" "dog" "person" "truck" ]; - # } - ]; - # esphome = { }; + image_processing = [ ]; # esphome = { }; frontend = { }; google_assistant = { project_id = "home-assistant-milano"; @@ -297,64 +273,8 @@ in ]; recorder.purge_keep_days = 30; script = "!include scripts.yaml"; - sensor = [ - # { - # platform = "systemmonitor"; - # resources = [ - # { type = "disk_use_percent"; } - # { type = "disk_use"; } - # { type = "disk_free"; } - # { type = "memory_use_percent"; } - # { type = "memory_use"; } - # { type = "memory_free"; } - # { type = "swap_use_percent"; } - # { type = "swap_use"; } - # { type = "swap_free"; } - # { type = "load_1m"; } - # { type = "load_5m"; } - # { type = "load_15m"; } - # { type = "network_in"; arg = "eno1"; } - # { type = "network_out"; arg = "eno1"; } - # { type = "throughput_network_in"; arg = "eno1"; } - # { type = "throughput_network_out"; arg = "eno1"; } - # { type = "packets_in"; arg = "eno1"; } - # { type = "packets_out"; arg = "eno1"; } - # { type = "ipv4_address"; arg = "eno1"; } - # { type = "ipv6_address"; arg = "eno1"; } - # { type = "network_in"; arg = "ztmjfdwjkp"; } - # { type = "network_out"; arg = "ztmjfdwjkp"; } - # { type = "throughput_network_in"; arg = "ztmjfdwjkp"; } - # { type = "throughput_network_out"; arg = "ztmjfdwjkp"; } - # { type = "packets_in"; arg = "ztmjfdwjkp"; } - # { type = "packets_out"; arg = "ztmjfdwjkp"; } - # { type = "ipv4_address"; arg = "ztmjfdwjkp"; } - # { type = "ipv6_address"; arg = "ztmjfdwjkp"; } - # { type = "processor_use"; } - # { type = "processor_temperature"; } - # # { type = "process"; arg = "octave-cli"; } - # { type = "last_boot"; } - # ]; - # } - ]; - shopping_list = { }; - sun = { }; system_health = { }; - # telegram_bot = [{ - # # platform = "polling"; - # platform = "webhooks"; - # api_key = "!secret telegram_api_key"; - # allowed_chat_ids = [ - # "!secret filippo_t_chat_id" - # "!secret famiglia_t_chat_id" - # ]; - # }]; - tts = [ - { - platform = "google_translate"; - language = "it"; - # tld = "it"; - } - ]; + tts = [{ platform = "google_translate"; language = "it"; }]; }; configDir = "/var/lib/hass"; configWritable = true; @@ -389,13 +309,9 @@ in "device_automation" "device_sun_light_trigger" "device_tracker" - "dlib_face_detect" - "dlib_face_identify" "dlna_dmr" "dlna_dms" "esphome" - "flux" - "gdacs" "google" "google_translate" "group" @@ -443,83 +359,13 @@ in ]; }; - # prometheus = { - # enable = true; - # exporters = { - # node = { - # enable = true; - # enabledCollectors = [ "systemd" ]; - # }; - # process = { - # enable = true; - # settings.process_names = [ - # # Remove nix store path from process name - # { - # name = "{{.Matches.Wrapped}} {{ .Matches.Args }}"; - # cmdline = [ "^/nix/store[^ ]*/(?P[^ /]*) (?P.*)" ]; - # } - # ]; - # }; - # systemd.enable = true; - # }; - # globalConfig = { - # scrape_interval = "10s"; - # }; - # scrapeConfigs = [ - # { - # job_name = "node"; - # static_configs = [ - # { targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; } - # ]; - # } - # { - # job_name = "process"; - # static_configs = [ - # { targets = [ "localhost:${toString config.services.prometheus.exporters.process.port}" ]; } - # ]; - # } - # { - # job_name = "systemd"; - # static_configs = [ - # { targets = [ "localhost:${toString config.services.prometheus.exporters.systemd.port}" ]; } - # ]; - # } - # ]; - # retentionTime = "15d"; - # }; - - snapper.configs = - let - common = { - TIMELINE_CREATE = true; - TIMELINE_CLEANUP = true; - }; - in - { - bertof = lib.recursiveUpdate common { - SUBVOLUME = "/mnt/raid/bertof/"; - ALLOW_USERS = [ "bertof" ]; - }; - tiziano = lib.recursiveUpdate common { - SUBVOLUME = "/mnt/raid/tiziano/"; - ALLOW_USERS = [ "tiziano" ]; - }; - condiviso = lib.recursiveUpdate common { - SUBVOLUME = "/mnt/raid/condiviso"; - ALLOW_USERS = [ - "bertof" - "tiziano" - ]; - }; - immich = lib.recursiveUpdate common { - SUBVOLUME = "/mnt/raid/immich"; - ALLOW_USERS = [ "bertof" ]; - }; - garage = lib.recursiveUpdate common { - SUBVOLUME = "/mnt/raid/garage"; - ALLOW_USERS = [ "bertof" ]; - }; - }; + snapper.configs = let common = { TIMELINE_CREATE = true; TIMELINE_CLEANUP = true; }; in { + bertof = lib.recursiveUpdate common { SUBVOLUME = "/mnt/raid/bertof/"; ALLOW_USERS = [ "bertof" ]; }; + tiziano = lib.recursiveUpdate common { SUBVOLUME = "/mnt/raid/tiziano/"; ALLOW_USERS = [ "tiziano" ]; }; + condiviso = lib.recursiveUpdate common { SUBVOLUME = "/mnt/raid/condiviso"; ALLOW_USERS = [ "bertof" "tiziano" ]; }; + immich = lib.recursiveUpdate common { SUBVOLUME = "/mnt/raid/immich"; ALLOW_USERS = [ "bertof" ]; }; + garage = lib.recursiveUpdate common { SUBVOLUME = "/mnt/raid/garage"; ALLOW_USERS = [ "bertof" ]; }; + }; }; time.timeZone = "Europe/Rome"; diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix index 07cdd3f..e91f67e 100644 --- a/instances/loki/configuration.nix +++ b/instances/loki/configuration.nix @@ -435,13 +435,9 @@ in "device_automation" "device_sun_light_trigger" "device_tracker" - "dlib_face_detect" - "dlib_face_identify" "dlna_dmr" "dlna_dms" "esphome" - "flux" - "gdacs" "google" "google_translate" "group" diff --git a/instances/odin/configuration.nix b/instances/odin/configuration.nix index 246f07d..f44c0a7 100644 --- a/instances/odin/configuration.nix +++ b/instances/odin/configuration.nix @@ -4,7 +4,7 @@ let in { boot = { - kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_latest; kernelParams = [ "acpi_osi=Linux-Dell-Video" ]; initrd.checkJournalingFS = true; # Use same ACPI identifier as Dell Ubuntu loader = { @@ -400,13 +400,9 @@ in "device_automation" "device_sun_light_trigger" "device_tracker" - # "dlib_face_detect" - # "dlib_face_identify" "dlna_dmr" "dlna_dms" "esphome" - "flux" - "gdacs" "google" "google_translate" "group" diff --git a/instances/sif/configuration.nix b/instances/sif/configuration.nix index cd4b0aa..561ff7c 100644 --- a/instances/sif/configuration.nix +++ b/instances/sif/configuration.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { # Use the systemd-boot EFI boot loader. boot = { - kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_6_7_hardened; # kernelPackages = pkgs.linuxPackages_6_8; kernelParams = [ ]; diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index 2c362e2..b5f0a51 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.nix @@ -18,7 +18,7 @@ "armv7l-linux" "aarch64-linux" ]; - kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_6_1; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; loader = {