diff options
| -rw-r--r-- | flake.lock | 18 | ||||
| -rwxr-xr-x | flake.nix | 13 | ||||
| -rw-r--r-- | host/Rory-desktop/configuration.nix | 2 | ||||
| -rwxr-xr-x | host/Rory-desktop/ollama.nix | 3 | ||||
| -rwxr-xr-x | host/Rory-nginx/services/matrix/draupnir.nix | 7 |
5 files changed, 40 insertions, 3 deletions
diff --git a/flake.lock b/flake.lock index f9a04d4..af9fae2 100644 --- a/flake.lock +++ b/flake.lock @@ -180,6 +180,23 @@ "type": "github" } }, + "draupnirSrc": { + "flake": false, + "locked": { + "lastModified": 1726318586, + "narHash": "sha256-B0xc0MVxghs0s3A+3Fv7AnmbIT8hNxLH/DLIvtQzxkQ=", + "owner": "the-draupnir-project", + "repo": "Draupnir", + "rev": "86b7a51992b0ffbeae74500bcdcbb65706fe636d", + "type": "github" + }, + "original": { + "owner": "the-draupnir-project", + "ref": "main", + "repo": "Draupnir", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -768,6 +785,7 @@ "inputs": { "botcore-v4": "botcore-v4", "conduit": "conduit", + "draupnirSrc": "draupnirSrc", "flake-utils": "flake-utils_3", "grapevine": "grapevine", "home-manager": "home-manager", diff --git a/flake.nix b/flake.nix index 7d6284c..de69e78 100755 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,11 @@ url = "github:Nheko-reborn/mtxclient/master"; flake = false; }; + + draupnirSrc = { + url = "github:the-draupnir-project/Draupnir/main"; + flake = false; + }; }; outputs = @@ -96,6 +101,8 @@ inherit conduit; inherit nixpkgs-Draupnir; #inherit conduwuit; + + inherit (inputs) draupnirSrc; }; }; @@ -212,6 +219,12 @@ ); packages.mtxclient-git = (pkgs.callPackage ./modules/packages/mtxclient-git.nix { inherit mtxclientSrc; }); + + # untested + packages.draupnir-main = pkgs.draupnir.overrideAttrs (oldAttrs: { + src = draupnirSrc; + version = draupnirSrc.rev; + }); } ); } diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix index aa09659..dae5f44 100644 --- a/host/Rory-desktop/configuration.nix +++ b/host/Rory-desktop/configuration.nix @@ -25,7 +25,7 @@ args@{ ./optional/gui/wayland.nix #./printing.nix -# ./ollama.nix + #./ollama.nix ]; boot = { diff --git a/host/Rory-desktop/ollama.nix b/host/Rory-desktop/ollama.nix index 7f0ae8c..0670617 100755 --- a/host/Rory-desktop/ollama.nix +++ b/host/Rory-desktop/ollama.nix @@ -31,7 +31,8 @@ #listenAddress = "0.0.0.0:11434"; host = "0.0.0.0"; port = 11434; - sandbox = false; + user = "ollama"; + group = "ollama"; acceleration = "rocm"; }; } diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix index f20a7d0..1fd4b08 100755 --- a/host/Rory-nginx/services/matrix/draupnir.nix +++ b/host/Rory-nginx/services/matrix/draupnir.nix @@ -1,7 +1,12 @@ -{ ... }: +{ pkgs, draupnirSrc, ... }: { services.draupnir = { + package = (pkgs.draupnir.overrideAttrs (oldAttrs: { + src = draupnirSrc; + version = draupnirSrc.rev; + })); + enable = true; homeserverUrl = "https://matrix.rory.gay"; accessTokenFile = "/etc/draupnir-access-token"; |