From 926a9ce8d2772b945db680d8c110fe40c30fe2eb Mon Sep 17 00:00:00 2001 From: joshashtondev Date: Fri, 18 Sep 2026 23:33:29 -0600 Subject: [PATCH] =?UTF-8?q?nixos:=20gen=2058=20@=20lilac=20=E2=80=94=20202?= =?UTF-8?q?6-09-18=2023:31=2026.05.20260918.cf9d2fb=20(Yarara)=20-----?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .claude/settings.local.json | 4 +++- flake.lock | 6 +++--- hosts/lilac/default.nix | 10 ++++++++-- system/packages.nix | 10 ++++++++-- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 63677c8..fe50769 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -9,7 +9,9 @@ "Bash(nix-instantiate --parse /home/jashton/.dotfiles/home/jashton.nix)", "Bash(git -C /home/jashton/.dotfiles status)", "Bash(git -C /home/jashton/.dotfiles log -3 --stat)", - "Bash(gh api *)" + "Bash(gh api *)", + "Bash(nix-store -q --references /nix/store/256vhj20yfbajhvdm3cpaxradb4pi1ac-ollama-0.34.0)", + "Bash(nix-store -q --references /nix/store/pxgnnjm1p1zlavx8i2wjdmz484lq4k8v-ollama-0.34.0)" ] } } diff --git a/flake.lock b/flake.lock index 4875268..ac0dfb2 100644 --- a/flake.lock +++ b/flake.lock @@ -317,11 +317,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1789654592, - "narHash": "sha256-vrwAiXmz+0hs/IWXZalFG/Ws6xQRcW+gClUDlfvcfjQ=", + "lastModified": 1789749394, + "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ecc58f32d1069a3e3f8a991e2233d365689f748d", + "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49", "type": "github" }, "original": { diff --git a/hosts/lilac/default.nix b/hosts/lilac/default.nix index 0515e5c..6e78387 100644 --- a/hosts/lilac/default.nix +++ b/hosts/lilac/default.nix @@ -1,5 +1,11 @@ -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: +let + unstable = import inputs.nixpkgs-unstable { + system = pkgs.stdenv.hostPlatform.system; + config.allowUnfree = true; + }; +in { imports = [ ./hardware.nix @@ -54,6 +60,6 @@ services.ollama = { enable = true; - package = pkgs.ollama-vulkan; + package = unstable.ollama-vulkan; }; } diff --git a/system/packages.nix b/system/packages.nix index fa44fc8..5dba027 100644 --- a/system/packages.nix +++ b/system/packages.nix @@ -1,5 +1,11 @@ -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: +let + unstable = import inputs.nixpkgs-unstable { + system = pkgs.stdenv.hostPlatform.system; + config.allowUnfree = true; + }; +in { nixpkgs.config.allowUnfree = true; @@ -36,7 +42,7 @@ nautilus networkmanagerapplet nitrogen - ollama + unstable.ollama pasystray playerctl pulseaudioFull