From 66fe87dd2362de8283fa5cee88621a2f1eaf9e3c Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 19 Dec 2025 14:49:44 -0600 Subject: [PATCH] update packages --- .../x86_64-linux/admin@jallen-nas/default.nix | 1 + .../home/programs/update-checker/default.nix | 18 ++++++++++++++++-- modules/home/sops/default.nix | 16 ++++++++-------- packages/homeassistant/ha-bambulab/default.nix | 4 ++-- packages/homeassistant/ha-bedjet/default.nix | 4 ++-- .../homeassistant/ha-local-llm/default.nix | 4 ++-- .../ha-mail-and-packages/default.nix | 4 ++-- packages/homeassistant/ha-nanokvm/default.nix | 4 ++-- packages/linux-cachyos/versions-hardened.json | 12 ++++++------ packages/linux-cachyos/versions-lts.json | 12 ++++++------ packages/linux-cachyos/versions-rc.json | 12 ++++++------ packages/linux-cachyos/versions.json | 12 ++++++------ .../nextcloud-app-assistant/default.nix | 4 ++-- packages/python/python-roborock/default.nix | 4 ++-- 14 files changed, 63 insertions(+), 48 deletions(-) diff --git a/homes/x86_64-linux/admin@jallen-nas/default.nix b/homes/x86_64-linux/admin@jallen-nas/default.nix index 237554e..51bbd91 100755 --- a/homes/x86_64-linux/admin@jallen-nas/default.nix +++ b/homes/x86_64-linux/admin@jallen-nas/default.nix @@ -3,6 +3,7 @@ home.username = "admin"; ${namespace} = { + sops.enable = true; shell-aliases = { enable = true; buildHost = ""; # NAS builds locally diff --git a/modules/home/programs/update-checker/default.nix b/modules/home/programs/update-checker/default.nix index 99f8b7d..f4c76d4 100644 --- a/modules/home/programs/update-checker/default.nix +++ b/modules/home/programs/update-checker/default.nix @@ -6,7 +6,7 @@ ... }: let - git-token = (if config.${namespace}.sops.enable then config.sops.secrets."github-token".path else "error"); + git-token = config.sops.secrets."github-token".path; update-checker = pkgs.writeScriptBin "update-checker" '' #!/usr/bin/env nix-shell @@ -271,7 +271,21 @@ let ''; in { - config = lib.mkIf config.${namespace}.sops.enable { + config = { + + sops = { + age.keyFile = "/home/${config.${namespace}.user.name}/.config/sops/age/keys.txt"; + defaultSopsFile = "/etc/nixos/secrets/secrets.yaml"; + validateSopsFiles = false; + secrets = { + "github-token" = { }; + }; + templates = { + ".env".content = '' + GITHUB_TOKEN = "${config.sops.placeholder.github-token}" + ''; + }; + }; home.packages = [ update-checker ]; }; } diff --git a/modules/home/sops/default.nix b/modules/home/sops/default.nix index 1bb1578..12e0e8c 100644 --- a/modules/home/sops/default.nix +++ b/modules/home/sops/default.nix @@ -15,14 +15,14 @@ in age.keyFile = "/home/${config.${namespace}.user.name}/.config/sops/age/keys.txt"; defaultSopsFile = "/etc/nixos/secrets/secrets.yaml"; validateSopsFiles = false; - secrets = { - "github-token" = { }; - }; - templates = { - ".env".content = '' - GITHUB_TOKEN = "${config.sops.placeholder.github-token}" - ''; - }; + # secrets = { + # "github-token" = { }; + # }; + # templates = { + # ".env".content = '' + # GITHUB_TOKEN = "${config.sops.placeholder.github-token}" + # ''; + # }; }; }; } diff --git a/packages/homeassistant/ha-bambulab/default.nix b/packages/homeassistant/ha-bambulab/default.nix index 4bba2dc..c1005c2 100644 --- a/packages/homeassistant/ha-bambulab/default.nix +++ b/packages/homeassistant/ha-bambulab/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "greghesp"; domain = "bambu_lab"; - version = "v2.2.17"; + version = "v2.2.18"; src = fetchFromGitHub { owner = owner; repo = "ha-bambulab"; rev = version; - hash = "sha256-0gAOCs/8U82eOK04mmWs6QqQR1os1eejwvF+pr7U/9c="; + hash = "sha256-47u2oG8MvEX0B8fu1Hs9sV7EXwPyOVRWNn6Mb4BpHGI="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-bedjet/default.nix b/packages/homeassistant/ha-bedjet/default.nix index e148e56..6c2a479 100644 --- a/packages/homeassistant/ha-bedjet/default.nix +++ b/packages/homeassistant/ha-bedjet/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "natekspencer"; domain = "bedjet"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = owner; repo = "ha-bedjet"; rev = version; - hash = "sha256-7rMAepajLRTIVXz025nYRQLx7Ra7+2LhELg9IvqdnHE="; + hash = "sha256-nJ2S1Wz/M/8my+5iDEMzfBZd9hKnrSBxUqnPfy6Tr7A="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-local-llm/default.nix b/packages/homeassistant/ha-local-llm/default.nix index dde3963..96812c5 100644 --- a/packages/homeassistant/ha-local-llm/default.nix +++ b/packages/homeassistant/ha-local-llm/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "acon96"; domain = "llama_conversation"; - version = "v0.4.4"; + version = "v0.4.5"; src = fetchFromGitHub { owner = owner; repo = "home-llm"; rev = version; - hash = "sha256-L5AL+f5i+LHIF0Fj+Hb5qlmYQbjDeGkAhBeL+qYXrMA="; + hash = "sha256-be4cW3f30G32MGl49YGja9/SlMHdnQ9IguuY14wgKGI="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-mail-and-packages/default.nix b/packages/homeassistant/ha-mail-and-packages/default.nix index 6b791bc..ab90e96 100644 --- a/packages/homeassistant/ha-mail-and-packages/default.nix +++ b/packages/homeassistant/ha-mail-and-packages/default.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "moralmunky"; domain = "mail_and_packages"; - version = "0.4.3-b20"; + version = "0.4.3-b21"; src = fetchFromGitHub { owner = owner; repo = "Home-Assistant-Mail-And-Packages"; rev = version; - hash = "sha256-ueZcfhspi+aViiZ//AJuExeB1Dk/DUeGXYogrXqiy3Q="; + hash = "sha256-0lhDsjqsNU2d5cSjxzLIDU9986dvpQ6bNxgUNzmo6pU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/packages/homeassistant/ha-nanokvm/default.nix b/packages/homeassistant/ha-nanokvm/default.nix index 72b792d..976660e 100644 --- a/packages/homeassistant/ha-nanokvm/default.nix +++ b/packages/homeassistant/ha-nanokvm/default.nix @@ -13,8 +13,8 @@ buildHomeAssistantComponent rec { src = fetchFromGitHub { owner = owner; repo = "homeassistant-nanokvm"; - rev = "0c753de42c6dbec301843162e10038471a236dae"; - hash = "sha256-uBmmzg4iV1gVPTKvYGLUNpQGGJvbhj70FOS6JubXHD0="; + rev = "0a67e8db4e0422df8b3436b30b7654c02b468d0f"; + hash = "sha256-5h1EqwpnsmWexqB3J/X4OcN9bfBYUxGxLF1Hrmoi5LY="; }; propagatedBuildInputs = [ diff --git a/packages/linux-cachyos/versions-hardened.json b/packages/linux-cachyos/versions-hardened.json index 78aa09b..39f699e 100644 --- a/packages/linux-cachyos/versions-hardened.json +++ b/packages/linux-cachyos/versions-hardened.json @@ -1,16 +1,16 @@ { "suffix": "-cachyos", "linux": { - "version": "6.17.9", - "hash": "sha256-bQiAO5U8UJ30jUTTKB7TklJDIdi7NT6yHAVVeQyPjgY=" + "version": "6.17.13", + "hash": "sha256-EWgC3DrRZGFjzG/+m926JKgGm1aRNewFI815kGTy7bk=" }, "config": { - "rev": "4e182cb7b8fca0077c06987b853312f25566e520", - "hash": "sha256-WuY9uRDsfHcFzpf6xQ6WoiLEbCZyvpIDw/mf9B0VG6k=" + "rev": "9d369789361623b8a3b842a71adccb19b24ba16f", + "hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c=" }, "patches": { - "rev": "5f5c847f252b91bc7127af8a3430b1153c28533d", - "hash": "sha256-GJ4hvp2Pyea+BXs845PxZFVlrU6KrzKsE6zfrZFae+I=" + "rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c", + "hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w=" }, "zfs": { "rev": "fe5ed524c72e0b2e2cd4c47ee5bc987290e89666", diff --git a/packages/linux-cachyos/versions-lts.json b/packages/linux-cachyos/versions-lts.json index a982fea..baee2ca 100644 --- a/packages/linux-cachyos/versions-lts.json +++ b/packages/linux-cachyos/versions-lts.json @@ -1,16 +1,16 @@ { "suffix": "-cachyos", "linux": { - "version": "6.12.60", - "hash": "sha256-pjCWshR0EdaDzsv4diK7L/SIW6wrNkHT1PECUMic3Pg=" + "version": "6.12.63", + "hash": "sha256-lQLF/+S4lDg8l6v8z3RDCoRzLwTuR2ucDYdjWynffbM=" }, "config": { - "rev": "4e182cb7b8fca0077c06987b853312f25566e520", - "hash": "sha256-WuY9uRDsfHcFzpf6xQ6WoiLEbCZyvpIDw/mf9B0VG6k=" + "rev": "9d369789361623b8a3b842a71adccb19b24ba16f", + "hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c=" }, "patches": { - "rev": "5f5c847f252b91bc7127af8a3430b1153c28533d", - "hash": "sha256-GJ4hvp2Pyea+BXs845PxZFVlrU6KrzKsE6zfrZFae+I=" + "rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c", + "hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w=" }, "zfs": { "rev": "fe5ed524c72e0b2e2cd4c47ee5bc987290e89666", diff --git a/packages/linux-cachyos/versions-rc.json b/packages/linux-cachyos/versions-rc.json index 8fa901e..552f38c 100644 --- a/packages/linux-cachyos/versions-rc.json +++ b/packages/linux-cachyos/versions-rc.json @@ -1,16 +1,16 @@ { "suffix": "-cachyos", "linux": { - "version": "6.18-rc7", - "hash": "sha256-SikW8FoO2bdxr5nOdxCwB7YYuTwVjNdUngK4AhivzDU=" + "version": "6.19.rc1", + "hash": "sha256-itUMYlX2BWUMmqeACu8ZaDMR/S2eBhDSIx1UZl9hh9E=" }, "config": { - "rev": "4e182cb7b8fca0077c06987b853312f25566e520", - "hash": "sha256-WuY9uRDsfHcFzpf6xQ6WoiLEbCZyvpIDw/mf9B0VG6k=" + "rev": "9d369789361623b8a3b842a71adccb19b24ba16f", + "hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c=" }, "patches": { - "rev": "5f5c847f252b91bc7127af8a3430b1153c28533d", - "hash": "sha256-GJ4hvp2Pyea+BXs845PxZFVlrU6KrzKsE6zfrZFae+I=" + "rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c", + "hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w=" }, "zfs": { "rev": "7de9800e5ce45d03c797be57a3e959fc914b2adb", diff --git a/packages/linux-cachyos/versions.json b/packages/linux-cachyos/versions.json index dd0a479..fbfffa7 100644 --- a/packages/linux-cachyos/versions.json +++ b/packages/linux-cachyos/versions.json @@ -3,18 +3,18 @@ "suffix": "-cachyos", "_linux": "pkgver from config's PKGBUILD", "linux": { - "version": "6.18.0", - "hash": "sha256-kQakYF2p4x/xdlnZWHgrgV+VkaswjQOw7iGq1sfc7Us=" + "version": "6.18.2", + "hash": "sha256-VYxrurdJSSs0+Zgn/oB7ADmnRGk8IdOn4Ds6SO2quWo=" }, "_config": "latest commit from https://github.com/CachyOS/linux-cachyos/commits/master/linux-cachyos", "config": { - "rev": "4e182cb7b8fca0077c06987b853312f25566e520", - "hash": "sha256-WuY9uRDsfHcFzpf6xQ6WoiLEbCZyvpIDw/mf9B0VG6k=" + "rev": "9d369789361623b8a3b842a71adccb19b24ba16f", + "hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c=" }, "_patches": "latest commit from https://github.com/CachyOS/kernel-patches/commits/master/x.y", "patches": { - "rev": "5f5c847f252b91bc7127af8a3430b1153c28533d", - "hash": "sha256-GJ4hvp2Pyea+BXs845PxZFVlrU6KrzKsE6zfrZFae+I=" + "rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c", + "hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w=" }, "_zfs": "search for `git+https://github.com/cachyos/zfs.git` in config's PKGBUILD", "zfs": { diff --git a/packages/nextcloud/nextcloud-app-assistant/default.nix b/packages/nextcloud/nextcloud-app-assistant/default.nix index f202ad7..944689a 100644 --- a/packages/nextcloud/nextcloud-app-assistant/default.nix +++ b/packages/nextcloud/nextcloud-app-assistant/default.nix @@ -4,7 +4,7 @@ }: fetchNextcloudApp { name = "nextcloud-app-assistant"; - sha256 = "sha256-ayt3FYGxBdIhugkofujdRWrVqgZVdZ2Z+Ieg35O/MpA="; - url = "https://github.com/nextcloud/assistant/archive/refs/tags/v2.11.0.tar.gz"; + sha256 = "sha256-HgEyfENQL37qoUISuW7O3EADBP92hegngw4GfgK3z/8="; + url = "https://github.com/nextcloud/assistant/archive/refs/tags/v2.12.0.tar.gz"; license = "agpl3Only"; } diff --git a/packages/python/python-roborock/default.nix b/packages/python/python-roborock/default.nix index 12cf9fd..88a535a 100644 --- a/packages/python/python-roborock/default.nix +++ b/packages/python/python-roborock/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonPackage rec { pname = "python-roborock"; - version = "3.12.2"; + version = "3.19.0"; pyproject = true; disabled = python3Packages.pythonOlder "3.11"; @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-KpuEveA13e2QUgLF/r2iIpohZ2379qWoPxDS6WcKxpI="; + hash = "sha256-nCewSP0ZgQvjZ4Ie4/kTzxxmJ5Zsm5i3EuW4ZiDBPMg="; }; pythonRelaxDeps = [ "pycryptodome" ];