diff --git a/flake.lock b/flake.lock index 08a3ca2..0ec1b17 100644 --- a/flake.lock +++ b/flake.lock @@ -694,6 +694,22 @@ "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": { "locked": { "lastModified": 1643052045, @@ -894,6 +910,7 @@ "determinate": "determinate", "home-manager": "home-manager", "nixpkgs": "nixpkgs_4", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks", diff --git a/flake.nix b/flake.nix index 6e2248a..3955775 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; 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/*"; pre-commit-hooks.url = "github:cachix/git-hooks.nix"; darwin = { @@ -27,6 +28,7 @@ home-manager, nixpkgs, nixpkgs-unstable, + nixpkgs-master, stylix, vpngate, ... @@ -62,11 +64,16 @@ system = "x86_64-linux"; config.allowUnfree = true; }; + master = import nixpkgs-master { + system = "x86_64-linux"; + config.allowUnfree = true; + }; in { hephaestus = nixpkgs.lib.nixosSystem { specialArgs = { inherit unstable; + inherit master; inherit vpngate; }; modules = [ @@ -113,6 +120,7 @@ ]; extraSpecialArgs = { inherit unstable; + inherit master; }; }; }; @@ -129,12 +137,17 @@ config.allowUnfree = true; inherit system; }; + master = import nixpkgs-master { + config.allowUnfree = true; + inherit system; + }; in { zelus = darwin.lib.darwinSystem { inherit system; specialArgs = { inherit unstable; + inherit master; }; modules = [ @@ -158,6 +171,7 @@ ]; extraSpecialArgs = { inherit unstable; + inherit master; }; }; }; diff --git a/hosts/hephaestus.nix b/hosts/hephaestus.nix index 058d6c2..f37db7f 100644 --- a/hosts/hephaestus.nix +++ b/hosts/hephaestus.nix @@ -1,6 +1,7 @@ { config, lib, + master, modulesPath, pkgs, unstable, @@ -322,7 +323,7 @@ in }; services.ollama = { - package = unstable.ollama; + package = master.ollama; enable = true; acceleration = "rocm"; host = "0.0.0.0";