Skip to content

Commit 946488b

Browse files
committed
nix update
1 parent 8395c85 commit 946488b

5 files changed

Lines changed: 27 additions & 32 deletions

File tree

example/cuda/flake.nix

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
inputs = {
3-
xnode-manager.url = "github:Openmesh-Network/xnode-manager";
3+
xnodeos.url = "github:Openmesh-Network/xnodeos";
44
xnode-ai-chat.url = "github:OpenxAI-Network/xnode-ai-chat/cache";
55
nixpkgs.follows = "xnode-ai-chat/nixpkgs";
66
};
@@ -24,13 +24,9 @@
2424
inherit inputs;
2525
};
2626
modules = [
27-
inputs.xnode-manager.nixosModules.container
27+
inputs.xnodeos.nixosModules.container
2828
{
29-
services.xnode-container.xnode-config = {
30-
host-platform = ./xnode-config/host-platform;
31-
state-version = ./xnode-config/state-version;
32-
hostname = ./xnode-config/hostname;
33-
};
29+
services.xnode-container.xnode-config = ../xnode-config;
3430
}
3531
inputs.xnode-ai-chat.nixosModules.default
3632
(
@@ -42,7 +38,7 @@
4238

4339
services.xnode-ai-chat.enable = true;
4440

45-
services.ollama.acceleration = "cuda";
41+
services.ollama.package = pkgs.ollama-cuda;
4642
hardware.graphics = {
4743
enable = true;
4844
extraPackages = [

example/flake.nix

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
inputs = {
3-
xnode-manager.url = "github:Openmesh-Network/xnode-manager";
3+
xnodeos.url = "github:Openmesh-Network/xnodeos";
44
xnode-ai-chat.url = "github:OpenxAI-Network/xnode-ai-chat/cache";
55
nixpkgs.follows = "xnode-ai-chat/nixpkgs";
66
};
@@ -20,27 +20,28 @@
2020
inherit inputs;
2121
};
2222
modules = [
23-
inputs.xnode-manager.nixosModules.container
23+
inputs.xnodeos.nixosModules.container
2424
{
25-
services.xnode-container.xnode-config = {
26-
host-platform = ./xnode-config/host-platform;
27-
state-version = ./xnode-config/state-version;
28-
hostname = ./xnode-config/hostname;
29-
};
25+
services.xnode-container.xnode-config = ./xnode-config;
3026
}
3127
inputs.xnode-ai-chat.nixosModules.default
32-
{
33-
services.xnode-ai-chat = {
34-
enable = true;
35-
defaultModel = "deepseek-r1";
36-
autoGenerate.enable = false;
37-
};
28+
(
29+
{ pkgs, ... }@args:
30+
{
31+
# START USER CONFIG
32+
services.xnode-ai-chat.defaultModel = "deepseek-r1";
33+
# END USER CONFIG
3834

39-
networking = {
40-
hostName = "xnode-ai-chat";
41-
firewall.allowedTCPPorts = [ 8080 ];
42-
};
43-
}
35+
services.xnode-ai-chat = {
36+
enable = true;
37+
autoGenerate.enable = false;
38+
};
39+
40+
services.ollama.package = pkgs.ollama-cpu;
41+
42+
networking.firewall.allowedTCPPorts = [ 8080 ];
43+
}
44+
)
4445
];
4546
};
4647
};

example/xnode-config/.empty

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Allow pushing folder to git

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nixos-module.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ in
5656
user = "ollama";
5757
loadModels = lib.mkIf (cfg.defaultModel != null) [ cfg.defaultModel ];
5858
};
59-
systemd.services.ollama-model-loader.serviceConfig.User = "ollama";
60-
systemd.services.ollama-model-loader.serviceConfig.Group = "ollama";
61-
systemd.services.ollama-model-loader.serviceConfig.DynamicUser = lib.mkForce false;
6259

6360
users = {
6461
users."open-webui" = {

0 commit comments

Comments
 (0)