update to unstable
Some checks failed
Verify Nix Flake / verify_build (push) Failing after 43s

This commit is contained in:
k 2025-03-26 15:06:26 -04:00
parent 293d5a7f6e
commit 789c83686f
4 changed files with 52 additions and 40 deletions

54
flake.lock generated
View File

@ -224,16 +224,14 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1741955947, "lastModified": 1742996658,
"narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "rev": "693840c01b9bef9e54100239cef937e53d4661bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -265,11 +263,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1741792691, "lastModified": 1742806253,
"narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e1f12151258b12c567f456d8248e4694e9390613", "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -281,21 +279,37 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1741862977, "lastModified": 1742422364,
"narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1742889210,
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1741513245, "lastModified": 1741513245,
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
@ -338,7 +352,7 @@
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"stylix": "stylix" "stylix": "stylix"
} }
}, },
@ -354,7 +368,7 @@
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nur": "nur", "nur": "nur",
"systems": "systems", "systems": "systems",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
@ -364,11 +378,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1742040559, "lastModified": 1742997483,
"narHash": "sha256-Hb3aw00C1/5ORiTCASwMd8vcLAl/GNJfyjXZyl/EKpc=", "narHash": "sha256-eDN1TAIj57ZTR8jsl63tdOdGebRdL7xE6Om0r0LZd5s=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "bcc674f1994396137438bac9d905971453d33b12", "rev": "daef51e92086a5b4d6a7756ad495dfd34353b7cb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -2,11 +2,10 @@
description = "Nixos config flake"; description = "Nixos config flake";
inputs = { inputs = {
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
}; };
outputs = { outputs = {

View File

@ -66,19 +66,19 @@
enable = true; enable = true;
package = pkgs.ollama-intel; package = pkgs.ollama-intel;
}; };
auto-cpufreq = { # auto-cpufreq = {
enable = true; # enable = true;
settings = { # settings = {
battery = { # battery = {
governor = "powersave"; # governor = "powersave";
turbo = "never"; # turbo = "never";
}; # };
charger = { # charger = {
governor = "balance_performance"; # governor = "balance_performance";
turbo = "auto"; # turbo = "auto";
}; # };
}; # };
}; #};
logind = { logind = {
lidSwitch = "suspend-then-hibernate"; lidSwitch = "suspend-then-hibernate";
lidSwitchExternalPower = "suspend"; lidSwitchExternalPower = "suspend";
@ -108,17 +108,17 @@
}; };
fonts = { fonts = {
serif = { serif = {
package = pkgs.nerdfonts; package = pkgs.nerd-fonts.iosevka;
name = "Iosevka NF"; name = "Iosevka NF";
}; };
sansSerif = { sansSerif = {
package = pkgs.nerdfonts; package = pkgs.nerd-fonts.iosevka;
name = "Iosevka NF"; name = "Iosevka NF";
}; };
monospace = { monospace = {
package = pkgs.nerdfonts; package = pkgs.nerd-fonts.iosevka;
name = "Iosevka NFM"; name = "Iosevka NFM";
}; };
}; };

View File

@ -16,7 +16,6 @@
or [] or []
++ [prev.intel-compute-runtime.drivers]; ++ [prev.intel-compute-runtime.drivers];
NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE or ""} -mavx2 -mfma -O3";
cmakeFlags = [ cmakeFlags = [
"GGML_NATIVE=true" "GGML_NATIVE=true"
"BUILD_SHARED_LIBS=true" "BUILD_SHARED_LIBS=true"