diff --git a/_sources/generated.json b/_sources/generated.json index d9d1875..b85add2 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -42,7 +42,7 @@ }, "blog": { "cargoLock": null, - "date": "2026-04-17", + "date": "2026-04-24", "extract": null, "name": "blog", "passthru": null, @@ -52,13 +52,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "07d745fb33cf580b79ff6d29631188eecd471357", - "sha256": "sha256-2ThCN55JV1b4YbMaOtc7oFVNNSU/IC8wx6F7Ybj1+z4=", + "rev": "9a31eccc91322536b4278f5b037f3c78e184abb3", + "sha256": "sha256-9G10HuIkLvWL2dzwA2FVdq/q17XWGcL+wlMZXyMKkJk=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/@ptr.pet/endpoint" }, - "version": "07d745fb33cf580b79ff6d29631188eecd471357" + "version": "9a31eccc91322536b4278f5b037f3c78e184abb3" }, "clickee": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 796c40c..ceb9057 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -34,17 +34,17 @@ }; blog = { pname = "blog"; - version = "07d745fb33cf580b79ff6d29631188eecd471357"; + version = "9a31eccc91322536b4278f5b037f3c78e184abb3"; src = fetchgit { url = "https://tangled.org/@ptr.pet/endpoint"; - rev = "07d745fb33cf580b79ff6d29631188eecd471357"; + rev = "9a31eccc91322536b4278f5b037f3c78e184abb3"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-2ThCN55JV1b4YbMaOtc7oFVNNSU/IC8wx6F7Ybj1+z4="; + sha256 = "sha256-9G10HuIkLvWL2dzwA2FVdq/q17XWGcL+wlMZXyMKkJk="; }; - date = "2026-04-17"; + date = "2026-04-24"; }; clickee = { pname = "clickee"; diff --git a/hosts/chernobog/modules/llm.nix b/hosts/chernobog/modules/llm.nix index c11893f..1cbf55e 100644 --- a/hosts/chernobog/modules/llm.nix +++ b/hosts/chernobog/modules/llm.nix @@ -1,6 +1,6 @@ -{pkgs, ...}: +{pkgs, terra, ...}: let - llama = (pkgs.llama-cpp.override { + llama = (terra.llama-cpp.override { blasSupport = true; vulkanSupport = true; cudaSupport = false; @@ -9,35 +9,7 @@ let doCheck = false; cmakeFlags = (old.cmakeFlags or []) ++ ["-DGGML_AVX2=ON" "-DGGML_FMA=ON" "-DGGML_F16C=ON"]; }); - # llama = pkgs.stdenv.mkDerivation { - # name = "llamacpp-rocm-b1229"; - - # src = pkgs.fetchurl { - # url = "https://github.com/lemonade-sdk/llamacpp-rocm/releases/download/b1229/llama-b1229-ubuntu-rocm-gfx110X-x64.zip"; - # hash = "sha256-RGKGfZ3HBssBhFaskb8IAQYMng+K4Fol7J0H5rCmgwA="; - # }; - # sourceRoot = "."; - - # nativeBuildInputs = [ pkgs.autoPatchelfHook pkgs.makeBinaryWrapper pkgs.unzip ]; - # buildInputs = [ pkgs.stdenv.cc.cc.lib ]; # just glibc/libstdc++ - - # installPhase = '' - # mkdir -p $out/bin $out/lib/rocblas - # cp *.so* $out/lib || true - # cp llama-* $out/bin - # chmod +x $out/bin/* - # ln -sf ${pkgs.rocmPackages.rocblas}/lib/rocblas/library $out/lib/rocblas/library - # ''; - - # autoPatchelfIgnoreMissingDeps = true; - # }; in { - # services.ollama = { - # enable = true; - # package = pkgs.ollama-rocm; - # rocmOverrideGfx = "11.0.0"; - # }; - hardware.amdgpu.opencl.enable = true; # services.llama-cpp = { diff --git a/hosts/trimounts/modules/website.nix b/hosts/trimounts/modules/website.nix index 2cca1db..c7f5741 100644 --- a/hosts/trimounts/modules/website.nix +++ b/hosts/trimounts/modules/website.nix @@ -5,13 +5,13 @@ ... }: let - PUBLIC_BASE_URL = "https://gaze.systems"; + PUBLIC_BASE_URL = "https://ptr.pet"; modules = (pkgs.callPackage "${inputs.blog}/nix/modules.nix" { }).overrideAttrs (_: { # outputHash = "sha256-rzfSfiK8FSNFR+1QTwM/ltLZBprG9BoQsPmOt6IdXFc="; }); pkg = pkgs.callPackage "${inputs.blog}/nix" { inherit PUBLIC_BASE_URL; - eunomia-modules = modules; + endpoint-modules = modules; }; port = 3003; vhostConfig = { @@ -59,7 +59,7 @@ in }; serviceConfig = { User = "website"; - ExecStart = "${pkg}/bin/eunomia"; + ExecStart = "${pkg}/bin/endpoint"; Restart = "on-failure"; RestartSec = 5; WorkingDirectory = "/var/lib/website"; diff --git a/pkgs-set/pkgs/helium.nix b/pkgs-set/pkgs/helium.nix index 290ab3d..390c8d4 100644 --- a/pkgs-set/pkgs/helium.nix +++ b/pkgs-set/pkgs/helium.nix @@ -5,7 +5,7 @@ }: pkgs.appimageTools.wrapType2 rec { pname = "helium"; - version = "0.10.8.1"; + version = "0.11.4.1"; src = let platformMap = { @@ -16,8 +16,8 @@ pkgs.appimageTools.wrapType2 rec { platform = platformMap.${pkgs.system}; hashes = { - "x86_64-linux" = "sha256-pN/Iw1ANggDOxxFb2CN436qbcrs8/bDcEqjZC80grQs="; - "aarch64-linux" = "sha256-B63tvOtSRlMRJozvzC7lqG2LM0ZgLIq2G/AHABl+Qqg="; + "x86_64-linux" = "sha256-EavHZuleVkgD4J+gcUQ2ZgGHjvWXzdamUh7r42bUkas="; + "aarch64-linux" = ""; }; hash = hashes.${pkgs.system}; diff --git a/pkgs-set/pkgs/llama-cpp.nix b/pkgs-set/pkgs/llama-cpp.nix index 31d2ba9..081ceb2 100644 --- a/pkgs-set/pkgs/llama-cpp.nix +++ b/pkgs-set/pkgs/llama-cpp.nix @@ -83,7 +83,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "8664"; + version = "8925"; outputs = [ "out" @@ -93,9 +93,9 @@ effectiveStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; - # tag = "b${finalAttrs.version}"; - rev = "b8635075ffe27b135c49afb9a8b5c434bd42c502"; - hash = "sha256-5rioYM989O6wXEtC3SWg7v3ZgMCSzE6/RyF6ILzY9rQ="; + tag = "b${finalAttrs.version}"; + # rev = "b8635075ffe27b135c49afb9a8b5c434bd42c502"; + hash = "sha256-BVRp+T4eKZYS0aT4SGx/M/k9HJ7V74M1z5OTOasFl8E="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -131,7 +131,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ [ openssl ]; npmRoot = "tools/server/webui"; - npmDepsHash = "sha256-DxgUDVr+kwtW55C4b89Pl+j3u2ILmACcQOvOBjKWAKQ="; + npmDepsHash = "sha256-RAFtsbBGBjteCt5yXhrmHL39rIDJMCFBETgzId2eRRk="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src patches; diff --git a/users/modules/discord/default.nix b/users/modules/discord/default.nix index 290f58e..4b825d3 100644 --- a/users/modules/discord/default.nix +++ b/users/modules/discord/default.nix @@ -5,7 +5,7 @@ }: let pkg = pkgs.discord.override { - withMoonlight = true; + withMoonlight = false; inherit (terra) moonlight; withOpenASAR = false; withTTS = false;