Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ollama

Browse Source
This commit is contained in:
Nathan
2024-11-29 11:51:22 -06:00
parent 657dbc4642
commit 0ac0dda339
4 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
flake.lock generated
View File

@@ -1244,11 +1244,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-Hripi5dnBGegbRPwCt1+a3oH6b1AQxEoJXodiLE8KKw=", "narHash": "sha256-Hripi5dnBGegbRPwCt1+a3oH6b1AQxEoJXodiLE8KKw=",
"path": "/nix/store/47vjafbwqsg8sw0dvm6jldpfns8s9p83-source/home-manager", "path": "/nix/store/hkcf7vkprn4xa45bzn42v4f8a6faxq51-source/home-manager",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/47vjafbwqsg8sw0dvm6jldpfns8s9p83-source/home-manager", "path": "/nix/store/hkcf7vkprn4xa45bzn42v4f8a6faxq51-source/home-manager",
"type": "path" "type": "path"
} }
}, },
@@ -1422,6 +1422,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-us_3": {
"locked": {
"lastModified": 1732521221,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1731676054, "lastModified": 1731676054,
@@ -1836,11 +1852,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=", "narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=",
"path": "/nix/store/cx67a4yaf78kbha7jyk1dqax1mjf059s-source/programs", "path": "/nix/store/di2lykzh84qyw3wqvv3alxrnqazbn7r2-source/programs",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/cx67a4yaf78kbha7jyk1dqax1mjf059s-source/programs", "path": "/nix/store/di2lykzh84qyw3wqvv3alxrnqazbn7r2-source/programs",
"type": "path" "type": "path"
} }
}, },
@@ -1897,6 +1913,7 @@
"nathan": "nathan", "nathan": "nathan",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_9",
"nixpkgs-us": "nixpkgs-us_3",
"nixvim": "nixvim_3", "nixvim": "nixvim_3",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"system": "system" "system": "system"
@@ -1909,11 +1926,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=", "narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=",
"path": "/nix/store/cx67a4yaf78kbha7jyk1dqax1mjf059s-source/services/sddm", "path": "/nix/store/di2lykzh84qyw3wqvv3alxrnqazbn7r2-source/services/sddm",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/cx67a4yaf78kbha7jyk1dqax1mjf059s-source/services/sddm", "path": "/nix/store/di2lykzh84qyw3wqvv3alxrnqazbn7r2-source/services/sddm",
"type": "path" "type": "path"
} }
}, },
@@ -1944,12 +1961,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-w0f7+T976ewz6ok9CZ7Mj5bbVn3Jwh9N0a7//1CKBjk=", "narHash": "sha256-eqfmhqUf1LyUU79MkozVeSM5D061QuV3/tT9cQKRfqQ=",
"path": "/nix/store/47vjafbwqsg8sw0dvm6jldpfns8s9p83-source/system-config", "path": "/nix/store/hkcf7vkprn4xa45bzn42v4f8a6faxq51-source/system-config",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/47vjafbwqsg8sw0dvm6jldpfns8s9p83-source/system-config", "path": "/nix/store/hkcf7vkprn4xa45bzn42v4f8a6faxq51-source/system-config",
"type": "path" "type": "path"
} }
}, },

2
flake.nix
View File

@@ -4,6 +4,8 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable";
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

4
system-config/services/containers/nextcloud/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { { config, lib, ... }: {
options.sysconfig.opts.virtualization.nextcloud.enable = lib.options.mkOption { options.sysconfig.opts.virtualization.nextcloud.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
@@ -57,7 +57,7 @@
}; };
https = true; https = true;
home = "/var/lib/nextcloud"; home = "/var/lib/nextcloud";
#appstoreEnable = true; appstoreEnable = true;
extraApps = with config.services.nextcloud.package.packages.apps; { extraApps = with config.services.nextcloud.package.packages.apps; {
inherit mail contacts calendar tasks user_oidc; inherit mail contacts calendar tasks user_oidc;
inherit impersonate end_to_end_encryption notes spreed music memories phonetrack; inherit impersonate end_to_end_encryption notes spreed music memories phonetrack;

8
system-config/services/ollama/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, ... }: { { config, lib, inputs, ... }: {
options = { options = {
sysconfig.opts.ollama.enable = lib.options.mkOption { sysconfig.opts.ollama.enable = lib.options.mkOption {
@@ -11,6 +11,12 @@
services.ollama = { services.ollama = {
enable = true; enable = true;
acceleration = "cuda"; acceleration = "cuda";
package = let
pkgs-us = import inputs.nixpkgs-us {
system = "x86_64-linux";
config.allowUnfree = true;
};
in pkgs-us.ollama;
}; };
}; };
} }