From bc9c310c77da8fa748614d1a1f1a8a4aecceb118 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sat, 29 Apr 2023 11:07:12 -0700 Subject: [PATCH] flake update --- .envrc | 6 +++++- flake.lock | 30 +++++++++++++-------------- nixos/systems/tewi/home-assistant.nix | 3 +++ 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.envrc b/.envrc index cfbd5798..2e542208 100644 --- a/.envrc +++ b/.envrc @@ -1,5 +1,6 @@ export NF_CONFIG_ROOT=$PWD export HOME_HOSTNAME=$(hostname -s) +FLAKE_ARGS=() if [[ $(id -un) = kat ]]; then git pull @@ -8,4 +9,7 @@ if [[ -e trusted/trusted/flake.nix ]]; then export TRUSTED=1 fi -use flake +source_env_if_exists .envrc.conf + +use flake "${FLAKE_ARGS[@]}" +export FLAKE_OPTS="${FLAKE_ARGS[*]}" diff --git a/flake.lock b/flake.lock index de7b58f0..acdd48d8 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "arcexprs": { "flake": false, "locked": { - "lastModified": 1682524738, - "narHash": "sha256-E0M5Ay6SqqcbNHTqv+tEkEugoAfq08NLI+QhwXXr5kA=", + "lastModified": 1682782350, + "narHash": "sha256-4+qdUKpLLEgr47/TRRdjuwxOkYGYbmyOtDztVsIj05A=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "010ea73d1ff235adf901c189968368786f597c42", + "rev": "e6c245071e4ffd037fe4c913fd1581dc342410aa", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1682009832, - "narHash": "sha256-QdNOeFE7sI+0ddqVfn9vQDCUs7OdxhJ7evo9sdyP82Y=", + "lastModified": 1682773107, + "narHash": "sha256-+h94XeJnG3uk5imJlBi/1lVmcfCbxHpwZp5u7n3Krwg=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a1ee4d333b092bc055655fb06229eb3013755812", + "rev": "379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8", "type": "github" }, "original": { @@ -310,11 +310,11 @@ ] }, "locked": { - "lastModified": 1682712853, - "narHash": "sha256-XWgurvKeJsCLOVZZyR2HlPt56mIjbSgoh/Mi6s5RQS4=", + "lastModified": 1682779989, + "narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c4f3a3707104999d5b6fe4c4e5c3833980a92513", + "rev": "3144311f31194b537808ae6848f86f3dbf977d59", "type": "github" }, "original": { @@ -428,11 +428,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682526928, - "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", + "lastModified": 1682692304, + "narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", + "rev": "937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37", "type": "github" }, "original": { @@ -476,11 +476,11 @@ }, "nur": { "locked": { - "lastModified": 1682725548, - "narHash": "sha256-fQFuIfYeBYJLMIsRpcQcb31YKrqazE1Pr10Ew+JaTPM=", + "lastModified": 1682751794, + "narHash": "sha256-+lo+jlBp5Np2UId6CfAQZdG/yLJLZhtoluMj1NkBlDU=", "owner": "nix-community", "repo": "nur", - "rev": "89e2b1f70eef8ee3524aa9ade5f19cf8dd9728fb", + "rev": "b3b850a6da43a794e7fab9566b529ca43e22458a", "type": "github" }, "original": { diff --git a/nixos/systems/tewi/home-assistant.nix b/nixos/systems/tewi/home-assistant.nix index 8edbe91f..a90da752 100644 --- a/nixos/systems/tewi/home-assistant.nix +++ b/nixos/systems/tewi/home-assistant.nix @@ -191,6 +191,8 @@ in { securetar getmac # for upnp integration python-otbr-api + protobuf3 + adb-shell (aiogithubapi.overrideAttrs (_: { doInstallCheck = false; })) ]; extraComponents = [ @@ -215,6 +217,7 @@ in { "homekit" "mpd" "mqtt" + "shopping_list" "tile" "wake_on_lan" "withings"