From 799398de332adb1872de6ab72f5072f7a39c67e3 Mon Sep 17 00:00:00 2001 From: k Date: Fri, 10 Jan 2025 16:13:42 -0500 Subject: [PATCH] Set to stable release --- flake.lock | 8 ++++---- flake.nix | 2 +- hosts/laptop/configuration.nix | 14 +++++++------- overlays/ollama.nix | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 19cc352..df8d4de 100644 --- a/flake.lock +++ b/flake.lock @@ -248,16 +248,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 6230256..a653dfc 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixos-hardware.url = "github:NixOS/nixos-hardware/master"; stylix.url = "github:danth/stylix"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 8d5a2ad..4029385 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -88,24 +88,24 @@ }; fonts = { serif = { - package = pkgs.nerd-fonts.iosevka; + package = pkgs.nerdfonts; name = "Iosevka NF"; }; sansSerif = { - package = pkgs.nerd-fonts.iosevka; + package = pkgs.nerdfonts; name = "Iosevka NF"; }; monospace = { - package = pkgs.nerd-fonts.iosevka; + package = pkgs.nerdfonts; name = "Iosevka NFM"; }; - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; +# emoji = { +# package = pkgs.notofonts; +# name = "Noto Color Emoji"; +# }; }; }; diff --git a/overlays/ollama.nix b/overlays/ollama.nix index ddba088..55f68ef 100644 --- a/overlays/ollama.nix +++ b/overlays/ollama.nix @@ -34,7 +34,7 @@ cat << EOF > "$out/bin/ollama-wrapped" #!/bin/sh export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib" - export OLLAMA_INTEL_GPU=-1 + export OLLAMA_INTEL_GPU=1 exec "$out/bin/ollama-base" "\$@" EOF chmod +x "$out/bin/ollama-wrapped"