diff --git a/flake.lock b/flake.lock index c5d0abd..b19aa44 100644 --- a/flake.lock +++ b/flake.lock @@ -1244,11 +1244,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-Hripi5dnBGegbRPwCt1+a3oH6b1AQxEoJXodiLE8KKw=", - "path": "/nix/store/47vjafbwqsg8sw0dvm6jldpfns8s9p83-source/home-manager", + "path": "/nix/store/hkcf7vkprn4xa45bzn42v4f8a6faxq51-source/home-manager", "type": "path" }, "original": { - "path": "/nix/store/47vjafbwqsg8sw0dvm6jldpfns8s9p83-source/home-manager", + "path": "/nix/store/hkcf7vkprn4xa45bzn42v4f8a6faxq51-source/home-manager", "type": "path" } }, @@ -1422,6 +1422,22 @@ "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": { "locked": { "lastModified": 1731676054, @@ -1836,11 +1852,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=", - "path": "/nix/store/cx67a4yaf78kbha7jyk1dqax1mjf059s-source/programs", + "path": "/nix/store/di2lykzh84qyw3wqvv3alxrnqazbn7r2-source/programs", "type": "path" }, "original": { - "path": "/nix/store/cx67a4yaf78kbha7jyk1dqax1mjf059s-source/programs", + "path": "/nix/store/di2lykzh84qyw3wqvv3alxrnqazbn7r2-source/programs", "type": "path" } }, @@ -1897,6 +1913,7 @@ "nathan": "nathan", "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_9", + "nixpkgs-us": "nixpkgs-us_3", "nixvim": "nixvim_3", "sops-nix": "sops-nix", "system": "system" @@ -1909,11 +1926,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=", - "path": "/nix/store/cx67a4yaf78kbha7jyk1dqax1mjf059s-source/services/sddm", + "path": "/nix/store/di2lykzh84qyw3wqvv3alxrnqazbn7r2-source/services/sddm", "type": "path" }, "original": { - "path": "/nix/store/cx67a4yaf78kbha7jyk1dqax1mjf059s-source/services/sddm", + "path": "/nix/store/di2lykzh84qyw3wqvv3alxrnqazbn7r2-source/services/sddm", "type": "path" } }, @@ -1944,12 +1961,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-w0f7+T976ewz6ok9CZ7Mj5bbVn3Jwh9N0a7//1CKBjk=", - "path": "/nix/store/47vjafbwqsg8sw0dvm6jldpfns8s9p83-source/system-config", + "narHash": "sha256-eqfmhqUf1LyUU79MkozVeSM5D061QuV3/tT9cQKRfqQ=", + "path": "/nix/store/hkcf7vkprn4xa45bzn42v4f8a6faxq51-source/system-config", "type": "path" }, "original": { - "path": "/nix/store/47vjafbwqsg8sw0dvm6jldpfns8s9p83-source/system-config", + "path": "/nix/store/hkcf7vkprn4xa45bzn42v4f8a6faxq51-source/system-config", "type": "path" } }, diff --git a/flake.nix b/flake.nix index fb541d5..9bb3067 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-us.url = "github:nixos/nixpkgs/nixos-unstable"; + disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/system-config/services/containers/nextcloud/default.nix b/system-config/services/containers/nextcloud/default.nix index e49358c..0a4edfc 100644 --- a/system-config/services/containers/nextcloud/default.nix +++ b/system-config/services/containers/nextcloud/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: { +{ config, lib, ... }: { options.sysconfig.opts.virtualization.nextcloud.enable = lib.options.mkOption { type = lib.types.bool; @@ -57,7 +57,7 @@ }; https = true; home = "/var/lib/nextcloud"; - #appstoreEnable = true; + appstoreEnable = true; extraApps = with config.services.nextcloud.package.packages.apps; { inherit mail contacts calendar tasks user_oidc; inherit impersonate end_to_end_encryption notes spreed music memories phonetrack; diff --git a/system-config/services/ollama/default.nix b/system-config/services/ollama/default.nix index 606e51e..5ee28b2 100644 --- a/system-config/services/ollama/default.nix +++ b/system-config/services/ollama/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: { +{ config, lib, inputs, ... }: { options = { sysconfig.opts.ollama.enable = lib.options.mkOption { @@ -11,6 +11,12 @@ services.ollama = { enable = true; acceleration = "cuda"; + package = let + pkgs-us = import inputs.nixpkgs-us { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + in pkgs-us.ollama; }; }; }