From 7448bc9a9fbf90330558cbfef64c8332bbb856ab Mon Sep 17 00:00:00 2001 From: roufpup Date: Thu, 30 Apr 2026 16:51:10 +0200 Subject: [PATCH] Llama.cpp stuff --- hive.nix | 2 +- hosts/vulpes/core/users.nix | 3 + hosts/vulpes/default.nix | 13 +++- hosts/vulpes/hjem-rum/default.nix | 40 +++++++++++ hosts/vulpes/infra/caddy.nix | 2 +- hosts/vulpes/infra/llm.nix | 62 +++++++++++++++++ hosts/vulpes/infra/media.nix | 2 +- hosts/work/core/packages.nix | 21 ++++-- hosts/work/core/services.nix | 28 ++++++++ hosts/work/core/users.nix | 4 +- hosts/work/default.nix | 1 + hosts/work/hjem-rum/default.nix | 22 ++++++ lib/default.nix | 3 + modules/priv | 2 +- modules/pub/arr.nix | 4 ++ npins/sources.json | 109 +++++++++++++----------------- vms/fluxer.nix | 8 +-- 17 files changed, 250 insertions(+), 76 deletions(-) create mode 100644 hosts/vulpes/hjem-rum/default.nix create mode 100644 hosts/vulpes/infra/llm.nix diff --git a/hive.nix b/hive.nix index fbfd4a7..3889ec7 100644 --- a/hive.nix +++ b/hive.nix @@ -70,7 +70,7 @@ wire.makeHive { ./hosts/vulpes/default.nix ]; deployment = { - buildOnTarget = false; + buildOnTarget = true; target = { host = "vulpes"; port = pm.hive.port; diff --git a/hosts/vulpes/core/users.nix b/hosts/vulpes/core/users.nix index 7652c67..ebd1227 100644 --- a/hosts/vulpes/core/users.nix +++ b/hosts/vulpes/core/users.nix @@ -28,6 +28,9 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIkUMYuTCjDCIldnrQlA8M5gPkEUZ/oXxD5+B7nNeoM3 openpgp:0x13D59319" ]; }; + root = { + shell = pkgs.fish; + }; sunshine = { group = "sunshine"; isNormalUser = true; diff --git a/hosts/vulpes/default.nix b/hosts/vulpes/default.nix index aaa2936..f41f566 100644 --- a/hosts/vulpes/default.nix +++ b/hosts/vulpes/default.nix @@ -8,7 +8,11 @@ let overlays = (args.pup_lib.get_overlays args); in { - imports = [ ] ++ (args.pup_lib.module_imports ./core) ++ (args.pup_lib.module_imports ./infra); + imports = [ + args.mods.hosts_modules.vulpes.hjem-rum + ] + ++ (args.pup_lib.module_imports ./core) + ++ (args.pup_lib.module_imports ./infra); environment = { enableAllTerminfo = true; @@ -47,7 +51,12 @@ in }; nixpkgs = { - config.allowUnfree = true; + config = { + allowUnfree = true; + permittedInsecurePackages = [ + "minio-2025-10-15T17-29-55Z" + ]; + }; hostPlatform = lib.mkDefault "x86_64-linux"; overlays = [ overlays.default diff --git a/hosts/vulpes/hjem-rum/default.nix b/hosts/vulpes/hjem-rum/default.nix new file mode 100644 index 0000000..b3ab64b --- /dev/null +++ b/hosts/vulpes/hjem-rum/default.nix @@ -0,0 +1,40 @@ +{ + args, + ... +}: +{ + imports = [ + args.pins.hjem.nixosModules.default + ]; + + hjem = { + clobberByDefault = true; + extraModules = [ + args.pins.hjem-rum.hjemModules.default + ]; + users = { + root = { + enable = true; + user = "root"; + rum = { + programs = { + direnv = { + enable = true; + integrations = { + fish.enable = true; + nix-direnv.enable = true; + }; + settings = { + global = { + log_filter = "^$"; + log_format = "-"; + }; + }; + }; + }; + }; + }; + }; + }; + +} diff --git a/hosts/vulpes/infra/caddy.nix b/hosts/vulpes/infra/caddy.nix index 928604e..8d48c30 100644 --- a/hosts/vulpes/infra/caddy.nix +++ b/hosts/vulpes/infra/caddy.nix @@ -24,7 +24,7 @@ in enable = true; package = pkgs.caddy.withPlugins { plugins = [ "github.com/caddy-dns/rfc2136@v1.0.0" ]; - hash = "sha256-S4cYVNHUhgtRSgz+Vl/+LkHnA4kYmmLIPU7q1DBD2jg="; + hash = "sha256-Zspz/TW3slTG6/zS/TSZYWA5N7NDacGosCQA3rTTKRw="; }; email = "pup@awoo.ren"; logFormat = lib.mkForce "level DEBUG"; diff --git a/hosts/vulpes/infra/llm.nix b/hosts/vulpes/infra/llm.nix new file mode 100644 index 0000000..8d8701c --- /dev/null +++ b/hosts/vulpes/infra/llm.nix @@ -0,0 +1,62 @@ +{ pkgs, ... }: +{ + services = { + llama-cpp = { + enable = true; + package = ( + (pkgs.llama-cpp.override { + rocmSupport = true; + vulkanSupport = true; + blasSupport = true; + }).overrideAttrs + (prev: rec { + version = "8966"; + src = pkgs.fetchFromGitHub { + owner = "ggml-org"; + repo = "llama.cpp"; + tag = "b${version}"; + hash = "sha256-3FuL0lyeQqwKE04QMx/0+pln2i0910L7TCDaoFjw7T8="; + leaveDotGit = true; + postFetch = '' + git -C "$out" rev-parse --short HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + npmDepsHash = "sha256-iYJB0z2YHG8OzEA9EwHUZrDa5obr5m2sbnIH+of28o0="; + + patches = [ + (pkgs.fetchpatch2 { + url = "https://github.com/ggml-org/llama.cpp/pull/22133.patch"; + sha256 = "sha256-Bas6HhjwQBqMW84HI5Xjt+pm72iDXpvA8ekjYS7cJew="; + }) + ]; + cmakeFlags = (prev.cmakeFlags or [ ]) ++ [ + "-DGGML_NATIVE=ON" + ]; + preConfigure = '' + export NIX_ENFORCE_NO_NATIVE=0 + ${prev.preConfigure or ""} + ''; + }) + ); + host = "0.0.0.0"; + port = 8585; + modelsPreset = + let + base_dir = "/var/lib/llama-cpp/models/"; + in + { + "gemma-4-26B-A4B-it-Q4_K_M" = { + model = "${base_dir}/gemma-4-26B-A4B-it/gemma-4-26B-A4B-it-Q4_K_M.gguf"; + mmproj = "${base_dir}/gemma-4-26B-A4B-it/gemma-4-26B-A4B-it-vision.gguf"; + ctx-size = 60000; + n-gpu-layers = 20; + cache-type-k = "q8_0"; + cache-type-v = "q8_0"; + no-mmproj-offload = true; + }; + }; + }; + }; +} diff --git a/hosts/vulpes/infra/media.nix b/hosts/vulpes/infra/media.nix index ca74e98..71d5f4a 100644 --- a/hosts/vulpes/infra/media.nix +++ b/hosts/vulpes/infra/media.nix @@ -51,7 +51,7 @@ in jellyfin = { enable = true; }; - jellyseerr = { + seerr = { enable = true; }; flaresolverr = { diff --git a/hosts/work/core/packages.nix b/hosts/work/core/packages.nix index 537534a..fc696b5 100644 --- a/hosts/work/core/packages.nix +++ b/hosts/work/core/packages.nix @@ -60,6 +60,11 @@ in virt-manager mullvad-vpn + # LLM + cherry-studio + python312Packages.huggingface-hub + llama-cpp-rocm + # Social signal-desktop mumble @@ -143,15 +148,23 @@ in vimix-icon-theme # 3rd party - args.pins.affinity-nix.packages."${pkgs.stdenv.hostPlatform.system}".v3 - args.pins.wire.packages.${builtins.currentSystem}.wire + args.pins.affinity-nix.packages."${pkgs.stdenv.hostPlatform.system}".affinity-v3 + # (args.pins.wire.packages.${builtins.currentSystem}.wire-small.overrideAttrs { + # patches = [ + # (pkgs.fetchpatch2 { + # url = "https://github.com/forallsys/wire/pull/475.patch"; + # sha256 = "sha256-f11OTW1ykEpKmxpOUxl3p/Q1pj8eEeQCXzQz9WxRjt4="; + # }) + # ]; + # }) + args.pins.wire.packages.${builtins.currentSystem}.wire-small jellyfin-desktop args.pins.dune.packages.default # args.pins.nur.legacyPackages.x86_64-linux.repos.lonerOrz.helium args.pins.helium.packages.x86_64-linux.default # For work - safenet_authentication_client - btrustbiss + # safenet_authentication_client + # btrustbiss ]; } diff --git a/hosts/work/core/services.nix b/hosts/work/core/services.nix index 9e0f85a..93c22d5 100644 --- a/hosts/work/core/services.nix +++ b/hosts/work/core/services.nix @@ -128,6 +128,34 @@ }; }; }; + + llama-cpp = { + enable = true; + package = ( + (pkgs.llama-cpp.override { + rocmSupport = true; + vulkanSupport = true; + }).overrideAttrs + { + patches = [ + (pkgs.fetchpatch2 { + url = "https://github.com/ggml-org/llama.cpp/pull/22133.patch"; + sha256 = "sha256-Bas6HhjwQBqMW84HI5Xjt+pm72iDXpvA8ekjYS7cJew="; + }) + ]; + } + ); + port = 8585; + modelsDir = "/var/lib/llama-cpp/models"; + extraFlags = [ + "-c" + "16384" + "--n-gpu-layers" + "10" + "--device" + "ROCm0" + ]; + }; }; systemd = { diff --git a/hosts/work/core/users.nix b/hosts/work/core/users.nix index 8e8a876..f3bf272 100644 --- a/hosts/work/core/users.nix +++ b/hosts/work/core/users.nix @@ -19,7 +19,9 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIkUMYuTCjDCIldnrQlA8M5gPkEUZ/oXxD5+B7nNeoM3 openpgp:0x13D59319" ]; }; - # initialPassword = "testvm"; + }; + root = { + shell = pkgs.fish; }; }; extraGroups = { diff --git a/hosts/work/default.nix b/hosts/work/default.nix index 8b4479a..b574cf6 100644 --- a/hosts/work/default.nix +++ b/hosts/work/default.nix @@ -93,6 +93,7 @@ in nixpkgs = { config = { allowUnfree = true; + rocmSupport = true; android_sdk.accept_license = true; permittedInsecurePackages = [ "librewolf-bin-147.0.2-1" diff --git a/hosts/work/hjem-rum/default.nix b/hosts/work/hjem-rum/default.nix index f81d5ae..0501215 100644 --- a/hosts/work/hjem-rum/default.nix +++ b/hosts/work/hjem-rum/default.nix @@ -17,6 +17,28 @@ in args.pins.hjem-rum.hjemModules.default ]; users = { + root = { + enable = true; + user = "root"; + rum = { + programs = { + direnv = { + enable = true; + integrations = { + fish.enable = true; + nix-direnv.enable = true; + }; + settings = { + global = { + log_filter = "^$"; + log_format = "-"; + }; + }; + }; + }; + }; + }; + roufpup = { enable = true; directory = home; diff --git a/lib/default.nix b/lib/default.nix index 3355ace..0654715 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -16,6 +16,9 @@ let work = { hjem-rum = ../hosts/work/hjem-rum; }; + vulpes = { + hjem-rum = ../hosts/vulpes/hjem-rum; + }; }; }; in diff --git a/modules/priv b/modules/priv index 81347f4..2c06961 160000 --- a/modules/priv +++ b/modules/priv @@ -1 +1 @@ -Subproject commit 81347f4dfb5e211d695c92bd6e0ebb4618285270 +Subproject commit 2c069612ec8922b3a04d424896b921d0b126e496 diff --git a/modules/pub/arr.nix b/modules/pub/arr.nix index 0307d02..d42903b 100644 --- a/modules/pub/arr.nix +++ b/modules/pub/arr.nix @@ -66,6 +66,10 @@ in uid = 7000; group = arr.group.name; home = arr.data-dir; + extraGroups = [ + "video" + "render" + ]; }; }; diff --git a/npins/sources.json b/npins/sources.json index 62a4ccf..4b1d92d 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -9,9 +9,9 @@ }, "branch": "main", "submodules": false, - "revision": "2eb82159e23e76a2d6fe89473fc7b479f60c6076", - "url": "https://github.com/mrshmllow/affinity-nix/archive/2eb82159e23e76a2d6fe89473fc7b479f60c6076.tar.gz", - "hash": "sha256-N6mS4i0c1owGiOXc1y96t2TcYeb3NCCOVlcZqugSN+0=" + "revision": "63978027513e2bafbf8c3acd7b05cb9b0ed24a03", + "url": "https://github.com/mrshmllow/affinity-nix/archive/63978027513e2bafbf8c3acd7b05cb9b0ed24a03.tar.gz", + "hash": "sha256-x+BBoim5p3dnPCeOrWp5V5IR09YzG3bPD0g60jsyvy4=" }, "crane": { "type": "Git", @@ -22,9 +22,9 @@ }, "branch": "master", "submodules": false, - "revision": "3fbd73bdd9eb572209fdf094abad19d9b6d147b4", - "url": "https://github.com/ipetkov/crane/archive/3fbd73bdd9eb572209fdf094abad19d9b6d147b4.tar.gz", - "hash": "sha256-P7TLDtRgAxmo0Bdw8fkJrrBpX/8/WhO6Bm/uCfl6jXY=" + "revision": "5e0fb2f64edff2822249f21293b8304dedaaf676", + "url": "https://github.com/ipetkov/crane/archive/5e0fb2f64edff2822249f21293b8304dedaaf676.tar.gz", + "hash": "sha256-bEg5xoAxAwsyfnGhkEX7RJViTIBIYPd8ISg4O1c0HFc=" }, "crate2nix": { "type": "Git", @@ -90,9 +90,9 @@ }, "branch": "master", "submodules": false, - "revision": "b422c32cbb574728c93e24ce2542806e27993c03", - "url": "https://github.com/amaanq/helium-flake/archive/b422c32cbb574728c93e24ce2542806e27993c03.tar.gz", - "hash": "sha256-ZK0fQvpYf3e+ty62WHbzK+ZcIJLnfZuyQV2x0PWuyCU=" + "revision": "d6f4aa6d9f313acdbdf7c356fd55c7d5e3c4c991", + "url": "https://github.com/amaanq/helium-flake/archive/d6f4aa6d9f313acdbdf7c356fd55c7d5e3c4c991.tar.gz", + "hash": "sha256-yILdOXqhZyCCWVEMCERd179AwPaMl94ZZdnBcV1kkGQ=" }, "helix-nix": { "type": "Git", @@ -115,9 +115,9 @@ }, "branch": "main", "submodules": false, - "revision": "3828faa3b6c14d4e557866db01d06137f33ad9f8", - "url": "https://github.com/feel-co/hjem/archive/3828faa3b6c14d4e557866db01d06137f33ad9f8.tar.gz", - "hash": "sha256-xjJpa+PGjB2lZi1saUU+ubWw5+FpAud/T0/jC1gLL1A=" + "revision": "35c2158ba101d7b42b05debfcb169ba32dad3bbc", + "url": "https://github.com/feel-co/hjem/archive/35c2158ba101d7b42b05debfcb169ba32dad3bbc.tar.gz", + "hash": "sha256-a0O56qWfPEKe0mBKgvcQL5UDpWmon70AKJspHNkEJV8=" }, "hjem-rum": { "type": "Git", @@ -127,9 +127,9 @@ }, "branch": "main", "submodules": false, - "revision": "1a4d8b2f2f936127c768c95a860b9d5cdb3eaa86", + "revision": "7e383954d22a49104c608e55b243d1e49db8776c", "url": null, - "hash": "sha256-CfzkXQwbCggKMMoCelLFeRj7dpR9xm2zjkHItQWrkDI=" + "hash": "sha256-zT9rRzAstRVm9CIaCu0jprqfV0LP3LbrqVRo8FaHypg=" }, "lanzaboote": { "type": "Git", @@ -140,9 +140,9 @@ }, "branch": "master", "submodules": false, - "revision": "18e9e64bae15b828c092658335599122a6db939b", - "url": "https://github.com/nix-community/lanzaboote/archive/18e9e64bae15b828c092658335599122a6db939b.tar.gz", - "hash": "sha256-TC6yzbCAex1pDfqUZv9u8fVm8e17ft5fNrcZ0JRDOIQ=" + "revision": "079c608988c2747db3902c9de033572cd50e8656", + "url": "https://github.com/nix-community/lanzaboote/archive/079c608988c2747db3902c9de033572cd50e8656.tar.gz", + "hash": "sha256-c0r3xXp2+xFJwkryS+nhyQwoACbFzSt4C1TVs3QMh8E=" }, "nix-index": { "type": "Git", @@ -153,21 +153,9 @@ }, "branch": "main", "submodules": false, - "revision": "bedba5989b04614fc598af9633033b95a937933f", - "url": "https://github.com/nix-community/nix-index-database/archive/bedba5989b04614fc598af9633033b95a937933f.tar.gz", - "hash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=" - }, - "nix-minecraft": { - "type": "Git", - "repository": { - "type": "Git", - "url": "file:///home/roufpup/repos/nix-minecraft" - }, - "branch": "neoforge", - "submodules": false, - "revision": "65330cab6a364a9bc26c1c69c557931b1c066392", - "url": null, - "hash": "sha256-Qhc93GD2kp9GIpeYyXxX72ZsuuixGx34rdYQm5IEpT0=" + "revision": "b8eb7acee0f7604fe1bf6a5b3dcf5254369180fa", + "url": "https://github.com/nix-community/nix-index-database/archive/b8eb7acee0f7604fe1bf6a5b3dcf5254369180fa.tar.gz", + "hash": "sha256-yVJbd07ortDRAttDFmDV5p220aOLTHgVAx//0nW/xW8=" }, "nixpkgs": { "type": "Git", @@ -178,9 +166,9 @@ }, "branch": "nixos-unstable", "submodules": false, - "revision": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", - "url": "https://github.com/NixOS/nixpkgs/archive/4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9.tar.gz", - "hash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=" + "revision": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "url": "https://github.com/NixOS/nixpkgs/archive/1c3fe55ad329cbcb28471bb30f05c9827f724c76.tar.gz", + "hash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=" }, "nixpkgs-master": { "type": "Git", @@ -191,9 +179,9 @@ }, "branch": "master", "submodules": false, - "revision": "47f0bfeb3b2a4bb10f8f7ade2ad6181ee753de3c", - "url": "https://github.com/NixOS/nixpkgs/archive/47f0bfeb3b2a4bb10f8f7ade2ad6181ee753de3c.tar.gz", - "hash": "sha256-qgoDM/jiT1HdQhfN1hTaSqII5UVOPcO1CfLDt28omWQ=" + "revision": "a154bc518d0e3058ef2f6cce81e88c2efbe7be95", + "url": "https://github.com/NixOS/nixpkgs/archive/a154bc518d0e3058ef2f6cce81e88c2efbe7be95.tar.gz", + "hash": "sha256-9pqBoQoCmqevawqopCuW4GEzacWldBDGC9DC8Wevkxs=" }, "nixpkgs-xr": { "type": "Git", @@ -204,9 +192,9 @@ }, "branch": "main", "submodules": false, - "revision": "40bb99d154d683c175853dffd838e0b2ef2f92b8", - "url": "https://github.com/nix-community/nixpkgs-xr/archive/40bb99d154d683c175853dffd838e0b2ef2f92b8.tar.gz", - "hash": "sha256-fAl9h5MeWOL5xgP+g4UF+yfNUZhcmsZ+kC5XHM/QFD4=" + "revision": "2d64ed34e0d39cc917cb075624b82779af3eea40", + "url": "https://github.com/nix-community/nixpkgs-xr/archive/2d64ed34e0d39cc917cb075624b82779af3eea40.tar.gz", + "hash": "sha256-hb1c1aYP7DFes//wxCQ0LKupX1aoWEsxkmZLqMnmw6g=" }, "nur": { "type": "Git", @@ -217,9 +205,9 @@ }, "branch": "main", "submodules": false, - "revision": "f42d87effcdce034096e7446ba8d99e50a609361", - "url": "https://github.com/nix-community/NUR/archive/f42d87effcdce034096e7446ba8d99e50a609361.tar.gz", - "hash": "sha256-IcM//BbehNjkx27ylghZtUVtotPOa16e6s/bvBkErrQ=" + "revision": "68c90674bf7614be9d0d4772a36416e8277717f6", + "url": "https://github.com/nix-community/NUR/archive/68c90674bf7614be9d0d4772a36416e8277717f6.tar.gz", + "hash": "sha256-fnqFNUir8uUsi8Qvh3216X6XaNS4NDtiZ3zxaMIkH1c=" }, "rust-overlay": { "type": "Git", @@ -230,9 +218,9 @@ }, "branch": "master", "submodules": false, - "revision": "e611106c527e8ab0adbb641183cda284411d575c", - "url": "https://github.com/oxalica/rust-overlay/archive/e611106c527e8ab0adbb641183cda284411d575c.tar.gz", - "hash": "sha256-Xq7p+Ex3YHFAd+fFFLOYw2Wv67582X7SAmrEDtIDZQ4=" + "revision": "146e7bf7569b8288f24d41d806b9f584f7cfd5b5", + "url": "https://github.com/oxalica/rust-overlay/archive/146e7bf7569b8288f24d41d806b9f584f7cfd5b5.tar.gz", + "hash": "sha256-oVxyGjpiIsrXhWTJVUOs38fZQkLjd0nZGOY9K7Kfot8=" }, "sops-nix": { "type": "Git", @@ -243,9 +231,9 @@ }, "branch": "master", "submodules": false, - "revision": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", - "url": "https://github.com/Mic92/sops-nix/archive/d4971dd58c6627bfee52a1ad4237637c0a2fb0cd.tar.gz", - "hash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=" + "revision": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", + "url": "https://github.com/Mic92/sops-nix/archive/8eaee5c45428b28b8c47a83e4c09dccec5f279b5.tar.gz", + "hash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=" }, "stash": { "type": "Git", @@ -269,9 +257,9 @@ }, "branch": "master", "submodules": false, - "revision": "956f97c314517efbfa18d04ce8e0234e6609a30a", + "revision": "ba44ea59aabf51db4712ea10ef0d6261e44c8b93", "url": null, - "hash": "sha256-bUR/cHqZP1zigWCo59KFF+F6UDuGM9q5CiFHdvnvSO8=" + "hash": "sha256-Y3Tgo5vCb6YkOHKPRqFTkOVpnvapW+feWVjOd8AQuas=" }, "tranquil_pds": { "type": "Git", @@ -281,22 +269,21 @@ }, "branch": "main", "submodules": false, - "revision": "7edb76507bade77319c06eb1ed515febbd5ed310", + "revision": "75b9e3165f8ec8d77a6be74867d64c5d3d45bec1", "url": null, - "hash": "sha256-9IjgABNXj2+bTFTUco5yEA6l2vrMrpzAWImrPMFWHMA=" + "hash": "sha256-frhz8tIiORLOK7dy+YqmUzCSJHdeaWgVsk1lXaWwawM=" }, "wire": { "type": "Git", "repository": { - "type": "GitHub", - "owner": "mrshmllow", - "repo": "wire" + "type": "Git", + "url": "https://tangled.org/althaea.zone/wire" }, - "branch": "stable", + "branch": "trunk", "submodules": false, - "revision": "5439d792ec7f876992300f10da37ff068dbafb29", - "url": "https://github.com/mrshmllow/wire/archive/5439d792ec7f876992300f10da37ff068dbafb29.tar.gz", - "hash": "sha256-vTO8yQsn0lCwxaXx/i4Njuv8NcENP8k5w1PKdVhT4lI=" + "revision": "bf92f6558a55e24070badada356dcbd1f3a6af84", + "url": null, + "hash": "sha256-3PK23W4FvXAvI/YnR/dC7d7X+Tb/h789pU6FyVldGI4=" } }, "version": 7 diff --git a/vms/fluxer.nix b/vms/fluxer.nix index c9af599..1bb2292 100644 --- a/vms/fluxer.nix +++ b/vms/fluxer.nix @@ -69,7 +69,7 @@ environment.defaultPackages = with pkgs; [ helix fluxer_server - minio-client + # minio-client ]; nixpkgs.overlays = [ (import ../overlays/fluxer { }) @@ -89,9 +89,9 @@ }; }; - minio = { - enable = true; - }; + # minio = { + # enable = true; + # }; openssh = { enable = true; -- 2.51.2