diff --git a/flake.lock b/flake.lock index b44b61c..3bfe690 100644 --- a/flake.lock +++ b/flake.lock @@ -1150,17 +1150,17 @@ }, "nixpkgs-latest-factorio": { "locked": { - "lastModified": 1731242709, - "narHash": "sha256-zGhhtd4U3AxjA5dqzbHhD10q74Ychyu5mNGI7ic+Yng=", + "lastModified": 1743943147, + "narHash": "sha256-4twtjynlPR8thJfN4Jty8ttMaAMXzuf/az1UCCL8mR4=", "owner": "Daholli", "repo": "nixpkgs", - "rev": "2adc4d1f11c5abcf654ed50c2cbce897c6e78ccc", + "rev": "9b2e671195f25c73366bc36863bf64ded6f71194", "type": "github" }, "original": { "owner": "Daholli", "repo": "nixpkgs", - "rev": "2adc4d1f11c5abcf654ed50c2cbce897c6e78ccc", + "rev": "9b2e671195f25c73366bc36863bf64ded6f71194", "type": "github" } }, @@ -1211,6 +1211,22 @@ "type": "github" } }, + "nixpkgs-tuya-vacuum": { + "locked": { + "lastModified": 1743180016, + "narHash": "sha256-REuNO+d3gTjk+03wZEcwCvXZNQGbb0nv44gwoLMTj4Q=", + "owner": "Daholli", + "repo": "nixpkgs", + "rev": "84b34e39e7a0879367189f34401191f6a0364bcf", + "type": "github" + }, + "original": { + "owner": "Daholli", + "repo": "nixpkgs", + "rev": "84b34e39e7a0879367189f34401191f6a0364bcf", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1742422364, @@ -1452,6 +1468,7 @@ "nixpkgs": "nixpkgs_6", "nixpkgs-latest-factorio": "nixpkgs-latest-factorio", "nixpkgs-master": "nixpkgs-master", + "nixpkgs-tuya-vacuum": "nixpkgs-tuya-vacuum", "nixpkgs-unstable": "nixpkgs-unstable", "raspberry-pi-nix": "raspberry-pi-nix", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -1898,7 +1915,6 @@ }, "original": { "owner": "jaidenlabelle", - "ref": "v0.1.4", "repo": "tuya-vacuum-maps", "type": "github" } diff --git a/flake.nix b/flake.nix index ce03847..7777517 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,8 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; - nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/2adc4d1f11c5abcf654ed50c2cbce897c6e78ccc"; + nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/9b2e671195f25c73366bc36863bf64ded6f71194"; + nixpkgs-tuya-vacuum.url = "github:Daholli/nixpkgs/84b34e39e7a0879367189f34401191f6a0364bcf"; home-manager = { url = "github:nix-community/home-manager/master"; diff --git a/overlays/tuya-vacuum/default.nix b/overlays/tuya-vacuum/default.nix new file mode 100644 index 0000000..28c9db1 --- /dev/null +++ b/overlays/tuya-vacuum/default.nix @@ -0,0 +1,5 @@ +{ channels, ... }: + +final: prev: { + tuya-vacuum = channels.nixpkgs-tuya-vacuum.python3Packages.tuya-vacuum; +} diff --git a/systems/aarch64-linux/nixberry/default.nix b/systems/aarch64-linux/nixberry/default.nix index e51e9cf..99f4a1b 100644 --- a/systems/aarch64-linux/nixberry/default.nix +++ b/systems/aarch64-linux/nixberry/default.nix @@ -1,4 +1,5 @@ { + config, inputs, lib, namespace, @@ -116,8 +117,9 @@ in }; systemd.tmpfiles.rules = [ - "C /var/lib/hass/custom_components/tuya-vaccum-maps - - - - ${inputs.tuya-vaccum-maps}/custom_components/tuya-vaccum-maps" + "C+ /var/lib/hass/custom_components/tuya_vacuum_maps - - - - ${inputs.tuya-vaccum-maps}/custom_components/tuya_vacuum_maps" "Z /var/lib/hass/custom_components 770 hass hass - -" + "f ${config.services.home-assistant.configDir}/automations.yaml 0755 hass hass" ]; services.home-assistant = { @@ -135,6 +137,12 @@ in smartthinq-sensors sleep_as_android ]; + + extraPackages = + python3Packages: with python3Packages; [ + tuya-vacuum + ]; + customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [ mushroom ];