From 8996adf9a255c3b7cce92cf5719d94278f98d0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 6 Jul 2024 07:16:10 +0200 Subject: [PATCH 1/2] add ollama --- config/rainbow-resort.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/rainbow-resort.nix b/config/rainbow-resort.nix index 706558a1..d7ec1cf8 100644 --- a/config/rainbow-resort.nix +++ b/config/rainbow-resort.nix @@ -104,4 +104,12 @@ system.autoUpgrade.allowReboot = true; services.prometheus.exporters.node.enabledCollectors = ["drm"]; services.k3s.role = lib.mkForce "agent"; + + services.ollama = { + enable = true; + acceleration = "rocm"; + # Thank you amd for not supporting 11.0.1 + environmentVariables.HCC_AMDGPU_TARGET = "gfx1100"; + rocmOverrideGfx = "11.0.0"; + }; } From a934ac49d36f5114cb17db492abf1073b715e831 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sat, 6 Jul 2024 18:12:39 +0000 Subject: [PATCH 2/2] Automatic Update --- flake.lock | 30 +++++++------- packages/matrix/matrix-media-repo/source.json | 10 ++--- .../matrix/mautrix-whatsapp/gomod2nix.toml | 40 +++++++++---------- packages/matrix/mautrix-whatsapp/source.json | 10 ++--- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 30e08dc6..d963af32 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ ] }, "locked": { - "lastModified": 1720045378, - "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", + "lastModified": 1720188602, + "narHash": "sha256-lC3byBmhVZFzWl/dCic8+cKUEEAXAswWOYjq4paFmbo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", + "rev": "e3582e5151498bc4d757e8361431ace8529e7bb7", "type": "github" }, "original": { @@ -552,11 +552,11 @@ ] }, "locked": { - "lastModified": 1719710498, - "narHash": "sha256-+yqI1zvk1jNcNTWA3CGnp5N2jSXr/q/CggYZYvGsdNc=", + "lastModified": 1720185178, + "narHash": "sha256-9KJ7KXQYDhnAfPIAvYYAEFW+85Gk9gm5W1pMoE/VMFg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "774908e566a0b3b702219fdf90a5ed4551b3688d", + "rev": "6caa391790442baea22260296041429fb365e0ce", "type": "github" }, "original": { @@ -657,11 +657,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720068098, - "narHash": "sha256-nuRe1MHPIZPnCnRnpFLn+wpYmsuWy5HzrRE6zdpTtPo=", + "lastModified": 1720289262, + "narHash": "sha256-VN+xu3KaySTt8PdfBYpqauX+xFZrpp7zDOkObav5deQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1aacb218f03f16293be0e70af7a9fe9a9608d5d2", + "rev": "e1e0b0f2c0a2fa36c546c5d40261284bd4d7ee3a", "type": "github" }, "original": { @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1720059535, - "narHash": "sha256-h/O3PoV3KvQG4tC5UpANBZOsptAZCzEGiwyi+3oSpYc=", + "lastModified": 1720232258, + "narHash": "sha256-eR5glZHS2bLpzUgTDhWGm04j+j5KMYKoDsY5DXAiuKQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8deeed2dfa21837c7792b46b6a9b2e73f97b472b", + "rev": "05ccbe21233d4e9110fc6428d2c3d74b430c3c69", "type": "github" }, "original": { @@ -730,11 +730,11 @@ ] }, "locked": { - "lastModified": 1719873517, - "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", + "lastModified": 1720187017, + "narHash": "sha256-Zq+T1Bvd0ShZB9XM+bP0VJK3HjsSVQBLolkaCLBQnfQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a11224af8d824935f363928074b4717ca2e280db", + "rev": "1b11e208cee97c47677439625dc22e5289dcdead", "type": "github" }, "original": { diff --git a/packages/matrix/matrix-media-repo/source.json b/packages/matrix/matrix-media-repo/source.json index 83c02a9b..eb905216 100644 --- a/packages/matrix/matrix-media-repo/source.json +++ b/packages/matrix/matrix-media-repo/source.json @@ -1,10 +1,10 @@ { "url": "https://github.com/turt2live/matrix-media-repo", - "rev": "e60dde718205a1078e9000daada06f199f615910", - "date": "2024-07-03T22:25:11Z", - "path": "/nix/store/d06pgnsdpx42p908kg88k285j2s03iv4-matrix-media-repo", - "sha256": "09ajyf3hqbc1g658k1cby62fja80c67cx75xx8bnlrbl7a5d14wk", - "hash": "sha256-k5PQijp0ZWoX6r2czo5hACnphPGLhYmKeYEtDIfzUiU=", + "rev": "33caaac42d1f7b1a6afac5f2dd3c39f1054f25ad", + "date": "2024-07-05T13:42:42-06:00", + "path": "/nix/store/vf2w9zzx9qcri4q4wa3g2xbs9mizk4b0-matrix-media-repo", + "sha256": "0gd0dqbqrncxgbq35g6d5vxqw86dbzbcm1b9nqbfjvhsp5b2l515", + "hash": "sha256-JRQqVrkabukWtmmFytZfzSCO+y7NvDLwep3ZjBduoD0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/packages/matrix/mautrix-whatsapp/gomod2nix.toml b/packages/matrix/mautrix-whatsapp/gomod2nix.toml index 9d6b7688..93f74369 100644 --- a/packages/matrix/mautrix-whatsapp/gomod2nix.toml +++ b/packages/matrix/mautrix-whatsapp/gomod2nix.toml @@ -2,8 +2,8 @@ schema = 3 [mod] [mod."filippo.io/edwards25519"] - version = "v1.0.0" - hash = "sha256-APnPAcmItvtJ5Zsy863lzR2TjEBF9Y66TY1e4M1ap98=" + version = "v1.1.0" + hash = "sha256-9ACANrgWZSd5HYPfDZHY8DVbPSC9LOMgy8deq3rDOoc=" [mod."github.com/beorn7/perks"] version = "v1.0.1" hash = "sha256-h75GUqfwJKngCJQVE5Ao5wnO3cfKD9lSIteoLp/3xJ4=" @@ -71,41 +71,41 @@ schema = 3 version = "v1.2.5" hash = "sha256-OYGNolkmL7E1Qs2qrQ3IVpQp5gkcHNU/AB/z2O+Myps=" [mod."github.com/yuin/goldmark"] - version = "v1.7.2" - hash = "sha256-0rjUJP5WJy6227Epkgm/UHU9xzvrOAvYW+Y3EC+MkTE=" + version = "v1.7.4" + hash = "sha256-1L0gZyD+AguN8GBy17rs54eFZv7LTU5dcttULEJRabI=" [mod."go.mau.fi/libsignal"] - version = "v0.1.0" - hash = "sha256-hSZQkw/0eV5Y0pj1N+idYuKb/jtiw/qTfaOGdYCXmn0=" + version = "v0.1.1-0.20240705162345-47e713a595ab" + hash = "sha256-Dv9uBYPpSMOPacao1VqJ1DFhpvsU+HDiIAKL0BY8BEc=" [mod."go.mau.fi/util"] - version = "v0.5.0" - hash = "sha256-Gpg/orzKd3emcQecqc++y3xDp43oC8owDljiiBNIxpQ=" + version = "v0.5.1-0.20240702170310-bd1da3c069eb" + hash = "sha256-04fZMIfda0VmnHJKhdicCfCvwO1WpV6EundKsH9u6MI=" [mod."go.mau.fi/webp"] version = "v0.1.0" hash = "sha256-KIP/Onw0t/o10oBuvmRQDff7GF8G5lsMaDXpe0fjvNg=" [mod."go.mau.fi/whatsmeow"] - version = "v0.0.0-20240619210240-329c2336a6f1" - hash = "sha256-J4taRK1xJMdrbQt9c5s6ncGvCtFpuGWGtaApY4BD49c=" + version = "v0.0.0-20240706081318-bd4d4e8f74f6" + hash = "sha256-QDM9c6BNvmk4vRZVQQSV96t69W0o6rmXhFaqEn2j630=" [mod."go.mau.fi/zeroconfig"] version = "v0.1.2" hash = "sha256-xf4p2Z5Pl9In3ne9BVmy7YvtooSRBzqxP4Pl2jdVN8w=" [mod."golang.org/x/crypto"] - version = "v0.24.0" - hash = "sha256-wpxJApwSmmn9meVdpFdOU0gzeJbIXcKuFfYUUVogSss=" + version = "v0.25.0" + hash = "sha256-traLAylqoBwGIh0Z1fuEhNjbGgQBItgVjtZYdYr0zzQ=" [mod."golang.org/x/exp"] version = "v0.0.0-20240613232115-7f521ea00fb8" hash = "sha256-QRK52QHPPhj+JIcQbd4/hI5ceEbKu3e9mR57XxocwOE=" [mod."golang.org/x/image"] - version = "v0.17.0" - hash = "sha256-tH5e4+0ero5B5/r5TwzxQZhnfCecQvmoles3UW24X/c=" + version = "v0.18.0" + hash = "sha256-g9N/y4asXG1lctPJ1KEf8XIjeJi/mQ43EXUa8HTj/zQ=" [mod."golang.org/x/net"] - version = "v0.26.0" - hash = "sha256-WfY33QERNbcIiDkH3+p2XGrAVqvWBQfc8neUt6TH6dQ=" + version = "v0.27.0" + hash = "sha256-GrlN5isYeEVrPZVAHK0MDQatttbnyfSPoWJHj0xqhjk=" [mod."golang.org/x/sync"] version = "v0.7.0" hash = "sha256-2ETllEu2GDWoOd/yMkOkLC2hWBpKzbVZ8LhjLu0d2A8=" [mod."golang.org/x/sys"] - version = "v0.21.0" - hash = "sha256-gapzPWuEqY36V6W2YhIDYR49sEvjJRd7bSuf9K1f4JY=" + version = "v0.22.0" + hash = "sha256-RbG0XaXGGlErCsl2agvUxMnrkRwdbJLmriYT1H24FwA=" [mod."golang.org/x/text"] version = "v0.16.0" hash = "sha256-hMTO45upjEuA4sJzGplJT+La2n3oAfHccfYWZuHcH+8=" @@ -122,5 +122,5 @@ schema = 3 version = "v1.0.0" hash = "sha256-fYc/WwqE0ev0dvnu5qGmHJsYiSTuWeOTiAVzmQIKWyY=" [mod."maunium.net/go/mautrix"] - version = "v0.19.0-beta.1.0.20240619204109-68d8ab6896fd" - hash = "sha256-jvlKfDTJyctVu3Mn18wZxCm0XrnW39lLGD87h7zmeKs=" + version = "v0.19.0-beta.1.0.20240706071202-017ca6222317" + hash = "sha256-shbH1x0pCpM2n9VvSU7JaPetR5EMH9IWU+xC2dx31/0=" diff --git a/packages/matrix/mautrix-whatsapp/source.json b/packages/matrix/mautrix-whatsapp/source.json index e8acf9c6..17a0b968 100644 --- a/packages/matrix/mautrix-whatsapp/source.json +++ b/packages/matrix/mautrix-whatsapp/source.json @@ -1,10 +1,10 @@ { "url": "https://github.com/mautrix/whatsapp", - "rev": "c72d7cb8d51f22a92b6b41821888490417f718ac", - "date": "2024-06-20T00:06:16+03:00", - "path": "/nix/store/3151w9b8n84pkn4gvwfbwa0wzv7i5q17-whatsapp", - "sha256": "0388gy5snw7wy8kp5wagvqdymy07w2kh5f5s671k9qnlj76s0kcf", - "hash": "sha256-jk2gzZHU4jTDMbq4AqfgB/jqG95P8XIn8vxwq4t/CA0=", + "rev": "46c8af02b4d8591ff2806e6b90ea85990f2b1690", + "date": "2024-07-06T11:19:51+03:00", + "path": "/nix/store/sz34jxjxzy38s7qb1zbnqxwhfar8xx7f-whatsapp", + "sha256": "145l27gfxrhy68a35d3iin4mzl0vqcwyk3nggcs5l4lyv7z5pcqz", + "hash": "sha256-H7Nb/tmeElo0e8+O6TnDG9BfiY1xtDIUMh7m7t4RtJA=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false,