Use ollama from master

This commit is contained in:
2025-05-18 10:11:11 -04:00
parent 1f9f0463e5
commit 2daab8d4f2
3 changed files with 33 additions and 1 deletions

17
flake.lock generated
View File

@@ -694,6 +694,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1747577170,
"narHash": "sha256-EG2R3RPpv3O5ggY+KPPOD6vB+x6+gpNHLXP5I2ELVqo=",
"owner": "NixOs",
"repo": "nixpkgs",
"rev": "4b7dfb442ffb06508dc47c7668184f96444b0fa3",
"type": "github"
},
"original": {
"owner": "NixOs",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-regression": { "nixpkgs-regression": {
"locked": { "locked": {
"lastModified": 1643052045, "lastModified": 1643052045,
@@ -894,6 +910,7 @@
"determinate": "determinate", "determinate": "determinate",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim", "nixvim": "nixvim",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",

View File

@@ -4,6 +4,7 @@
inputs = { inputs = {
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1"; nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1";
nixpkgs-master.url = "github:NixOs/nixpkgs/master";
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*";
pre-commit-hooks.url = "github:cachix/git-hooks.nix"; pre-commit-hooks.url = "github:cachix/git-hooks.nix";
darwin = { darwin = {
@@ -27,6 +28,7 @@
home-manager, home-manager,
nixpkgs, nixpkgs,
nixpkgs-unstable, nixpkgs-unstable,
nixpkgs-master,
stylix, stylix,
vpngate, vpngate,
... ...
@@ -62,11 +64,16 @@
system = "x86_64-linux"; system = "x86_64-linux";
config.allowUnfree = true; config.allowUnfree = true;
}; };
master = import nixpkgs-master {
system = "x86_64-linux";
config.allowUnfree = true;
};
in in
{ {
hephaestus = nixpkgs.lib.nixosSystem { hephaestus = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit unstable; inherit unstable;
inherit master;
inherit vpngate; inherit vpngate;
}; };
modules = [ modules = [
@@ -113,6 +120,7 @@
]; ];
extraSpecialArgs = { extraSpecialArgs = {
inherit unstable; inherit unstable;
inherit master;
}; };
}; };
}; };
@@ -129,12 +137,17 @@
config.allowUnfree = true; config.allowUnfree = true;
inherit system; inherit system;
}; };
master = import nixpkgs-master {
config.allowUnfree = true;
inherit system;
};
in in
{ {
zelus = darwin.lib.darwinSystem { zelus = darwin.lib.darwinSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit unstable; inherit unstable;
inherit master;
}; };
modules = [ modules = [
@@ -158,6 +171,7 @@
]; ];
extraSpecialArgs = { extraSpecialArgs = {
inherit unstable; inherit unstable;
inherit master;
}; };
}; };
}; };

View File

@@ -1,6 +1,7 @@
{ {
config, config,
lib, lib,
master,
modulesPath, modulesPath,
pkgs, pkgs,
unstable, unstable,
@@ -322,7 +323,7 @@ in
}; };
services.ollama = { services.ollama = {
package = unstable.ollama; package = master.ollama;
enable = true; enable = true;
acceleration = "rocm"; acceleration = "rocm";
host = "0.0.0.0"; host = "0.0.0.0";