starred/nix-config-ryan4yin
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-01-11 14:20:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

feat: update inputs, remove asahi's mesa workaround

Browse Source
This commit is contained in:
Ryan Yin
2025-12-25 12:41:47 +08:00
parent 38354330ea
commit 9f4ff5a8a3
4 changed files with 10 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Justfile
View File

@@ -100,7 +100,12 @@ repair-store *paths:
# Update all Nixpkgs inputs
[group('nix')]
up-nix:
nix flake update nixpkgs nixpkgs-stable nixpkgs-unstable nixpkgs-darwin nixpkgs-patched
nix flake update --commit-lock-file nixpkgs-stable nixpkgs-master nixpkgs-darwin nixpkgs-patched
# override nixpkgs's commit hash
[group('nix')]
override-pkgs hash:
nix flake update --commit-lock-file nixpkgs --override-input nixpkgs github:NixOS/nixpkgs/{{hash}}
############################################################################
#

24
flake.lock generated
View File

@@ -687,16 +687,15 @@
]
},
"locked": {
"lastModified": 1763596466,
"narHash": "sha256-CTSUc4Fk1lHMQZMJ5LczPDYGLq5UjXDFKLSpuA3mKmI=",
"lastModified": 1766064315,
"narHash": "sha256-aMoYLYIj+yYGhDKuSromj+VZYnMyN3lRRAZ+dk1IOiE=",
"owner": "nix-community",
"repo": "nixos-apple-silicon",
"rev": "73b7103c4e3996e3e20868d510b0e8797f279323",
"rev": "f94f4496775f9ca6e8a9e9e83f5aa4e4210fbb5d",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-2025-11-18",
"repo": "nixos-apple-silicon",
"type": "github"
}
@@ -823,22 +822,6 @@
"type": "github"
}
},
"nixpkgs-mesa": {
"locked": {
"lastModified": 1761817761,
"narHash": "sha256-qAEhDH77SIUUOUQC6DYYR+LGTAK+OctxBJPpo9rGMwc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781",
"type": "github"
}
},
"nixpkgs-patched": {
"locked": {
"lastModified": 1762844143,
@@ -1060,7 +1043,6 @@
"nixpkgs-2505": "nixpkgs-2505",
"nixpkgs-darwin": "nixpkgs-darwin",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-mesa": "nixpkgs-mesa",
"nixpkgs-patched": "nixpkgs-patched",
"nixpkgs-stable": "nixpkgs-stable",
"nu_scripts": "nu_scripts",

4
flake.nix
View File

@@ -39,8 +39,6 @@
# update via nix flake update nixpkgs --override-input nixpkgs github:NixOS/nixpkgs/<commit-hash>
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
# revert mesa to 25.2.6
nixpkgs-mesa.url = "github:nixos/nixpkgs/2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781";
nixpkgs-2505.url = "github:nixos/nixpkgs/nixos-25.05";
# nixpkgs with some custom patches
@@ -142,7 +140,7 @@
nixos-apple-silicon = {
# asahi-6.17.7-2
url = "github:nix-community/nixos-apple-silicon/release-2025-11-18";
url = "github:nix-community/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs";
};

8
hosts/12kingdoms-shoukei/apple-silicon.nix
View File

@@ -3,7 +3,6 @@
pkgs,
nixos-apple-silicon,
my-asahi-firmware,
nixpkgs-mesa,
...
}:
{
@@ -13,13 +12,6 @@
zramSwap.memoryPercent = lib.mkForce 75;
# Workaround for Mesa 25.3.1 regression
# https://github.com/nix-community/nixos-apple-silicon/issues/380
# https://github.com/NixOS/nixpkgs/pull/461866
hardware.graphics.package =
assert pkgs.mesa.version == "25.3.1";
(import nixpkgs-mesa { localSystem = pkgs.stdenv.hostPlatform; }).mesa;
nix.settings = {
extra-substituters = [
"https://nixos-apple-silicon.cachix.org"